rpms/puppet/F-12 puppet.spec,1.37,1.38

Todd M. Zullinger tmz at fedoraproject.org
Tue Jan 5 22:49:18 UTC 2010


Author: tmz

Update of /cvs/extras/rpms/puppet/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10228

Modified Files:
	puppet.spec 
Log Message:
Replace %%define with %%global for macros



Index: puppet.spec
===================================================================
RCS file: /cvs/extras/rpms/puppet/F-12/puppet.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- puppet.spec	5 Jan 2010 22:40:31 -0000	1.37
+++ puppet.spec	5 Jan 2010 22:49:18 -0000	1.38
@@ -1,12 +1,12 @@
 # Augeas and SELinux requirements may be disabled at build time by passing
 # --without augeas and/or --without selinux to rpmbuild or mock
 
-%{!?ruby_sitelibdir: %define ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%define confdir conf/redhat
+%{!?ruby_sitelibdir: %global ruby_sitelibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
+%global confdir conf/redhat
 
 Name:           puppet
 Version:        0.25.2
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
@@ -222,6 +222,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Tue Jan 05 2010 Todd Zullinger <tmz at pobox.com> - 0.25.2-1.1
+- Replace %%define with %%global for macros
+
 * Tue Jan 05 2010 Todd Zullinger <tmz at pobox.com> - 0.25.2-1
 - Update to 0.25.2
 - Fixes CVE-2010-0156, tmpfile security issue (#502881)




More information about the fedora-extras-commits mailing list