Merge branch 'f18'

puppet.spec

@@ -2,6 +2,9 @@
 # --without augeas and/or --without selinux to rpmbuild or mock
 
 # F-17 and above have ruby-1.9.x, and place libs in a different location
+
+# Specifically not using systemd on F18 as it's technically a break between
+# using SystemV on 2.7.x and Systemd on 3.1.0.
 %if 0%{?fedora} >= 17
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 %else
@@ -9,7 +12,7 @@
 %endif
 
 # F-17 also ships with systemd; package/use systemd files in this case
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} > 18
 %global _with_systemd 1
 %else
 %global _with_systemd 0
@@ -20,7 +23,7 @@
 
 Name:           puppet
 Version:        3.1.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
@@ -348,6 +351,10 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Thu Mar 07 2013 Michael Stahnke <stahnma@puppetlabs.com> - 3.1.0-4
+- Disable systemd in F18 as per bz#873853
+- Update Patch0 to work with 3.1
+
 * Thu Mar  7 2013 Daniel Drake <dsd@laptop.org> - 3.1.0-2
 - Improve server compatibility with old puppet clients (#831303)