This commit is contained in:
Jiri Popelka 2011-03-02 10:41:48 +01:00
parent b2f01851dc
commit 9ac4a37707
4 changed files with 10 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/dhcp-4.2.1b1.tar.gz /dhcp-4.2.1b1.tar.gz
/dhcp-4.2.1rc1.tar.gz /dhcp-4.2.1rc1.tar.gz
/dhcp-4.2.1.tar.gz

View File

@ -145,18 +145,6 @@ diff -up dhcp-4.2.1b1/client/dhclient.conf.5.man dhcp-4.2.1b1/client/dhclient.co
require subnet-mask, domain-name-servers; require subnet-mask, domain-name-servers;
script "CLIENTBINDIR/dhclient-script"; script "CLIENTBINDIR/dhclient-script";
media "media 10baseT/UTP", "media 10base2/BNC"; media "media 10baseT/UTP", "media 10base2/BNC";
diff -up dhcp-4.2.1b1/client/dhclient.leases.5.man dhcp-4.2.1b1/client/dhclient.leases.5
--- dhcp-4.2.1b1/client/dhclient.leases.5.man 2010-07-06 21:03:11.000000000 +0200
+++ dhcp-4.2.1b1/client/dhclient.leases.5 2011-02-09 12:01:48.000000000 +0100
@@ -39,7 +39,7 @@ database of leases that it has acquired
database is a free-form ASCII file containing one valid declaration
per lease. If more than one declaration appears for a given lease,
the last one in the file is used. The file is written as a log, so
-this is not an unusual occurrance.
+this is not an unusual occurrence.
.PP
The format of the lease declarations is described in
.B dhclient.conf(5).
diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8 diff -up dhcp-4.2.1b1/client/dhclient-script.8.man dhcp-4.2.1b1/client/dhclient-script.8
--- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200 --- dhcp-4.2.1b1/client/dhclient-script.8.man 2010-07-06 21:03:11.000000000 +0200
+++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100 +++ dhcp-4.2.1b1/client/dhclient-script.8 2011-01-27 18:24:44.000000000 +0100

View File

@ -7,15 +7,16 @@
# Patch version # Patch version
#%global patchver P2 #%global patchver P2
# Pre-Release version # Pre-Release version
%global prever rc1 #%global prever rc1
#%define VERSION %{version}-%{patchver} #%global VERSION %{version}-%{patchver}
%global VERSION %{version}%{prever} #%global VERSION %{version}%{prever}
%global VERSION %{version}
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.2.1 Version: 4.2.1
Release: 0.6.%{prever}%{?dist} Release: 1%{?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.
@ -629,6 +630,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Wed Mar 02 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.1-1
- 4.2.1
* Wed Feb 23 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.1-0.6.rc1 * Wed Feb 23 2011 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.1-0.6.rc1
- 4.2.1rc1 - 4.2.1rc1
- Fixed typo in dhclient.leases(5) (#676284) - Fixed typo in dhclient.leases(5) (#676284)

View File

@ -1 +1 @@
979a9fdedb35d714c4e99155a8509f58 dhcp-4.2.1rc1.tar.gz bddce8a23551f009fd0ac840afc89780 dhcp-4.2.1.tar.gz