- Use %global instead of %define.

This commit is contained in:
Jiří Popelka 2010-01-07 07:37:30 +00:00
parent 59ea29af7c
commit 606ac5674b

View File

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