rpms/dhcp/devel dhcp.spec,1.280,1.281

[Jiří Popelka]

Author: jpopelka

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2114

Modified Files:
	dhcp.spec 
Log Message:
* Thu Jan 07 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-16
- Use %global instead of %define.



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- dhcp.spec	14 Dec 2009 10:56:21 -0000	1.280
+++ dhcp.spec	7 Jan 2010 07:37:30 -0000	1.281
@@ -1,19 +1,19 @@
 # vendor string (e.g., Fedora, EL)
-%define vvendor Fedora
+%global vvendor Fedora
 
 # Where dhcp configuration files are stored
-%define dhcpconfdir %{_sysconfdir}/dhcp
+%global dhcpconfdir %{_sysconfdir}/dhcp
 
 # Base version number from ISC
-%define basever 4.1.0
+%global basever 4.1.0
 
 # LDAP patch version
-%define ldappatchver %{basever}-5
+%global ldappatchver %{basever}-5
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}p1
-Release:  15%{?dist}
+Release:  16%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -252,7 +252,7 @@ popd
 %{__perl_requires} \
 | %{__grep} -v 'perl('
 EOF
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 %{__chmod} +x %{__perl_requires}
 
 # Replace @PRODUCTNAME@
@@ -486,6 +486,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Thu Jan 07 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-16
+- Use %%global instead of %%define.
+
 * Mon Dec 14 2009 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.0p1-15
 - dhclient logs its pid to make troubleshooting NM managed systems
   with multiple dhclients running easier (#546792)