- 'up' to 3.0.5

- epoch bumped to 5 to make version 3.0.5 default, as 3.1 is beta
- 3.0.3 patch back TO MAKE DHCDBD AND NETWORK MANAGER WORK BAGGINS!!

Changed files:
    dhcp.spec -> 1.125

diff --git a/dhcp.spec b/dhcp.spec
index 96b688b92717809f747cbfd65a25d23e08c2996d..aefa78e3176d5bcb4a0425f0bbcbc32746e6670e 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -7,13 +7,13 @@ Summary(es):  Servidor DHCP
 Summary(pl):   Serwer DHCP
 Summary(pt_BR):        Servidor DHCP (Protocolo de configuração dinâmica de hosts)
 Name:          dhcp
-Version:       3.1.0a1
-Release:       0.5
-Epoch:         3
+Version:       3.0.5
+Release:       1
+Epoch:         4
 License:       distributable
 Group:         Networking/Daemons
 Source0:       ftp://ftp.isc.org/isc/dhcp/%{name}-%{version}.tar.gz
-# Source0-md5: a326c6f135b9fa3ad24988312c784be5
+# Source0-md5: ce5d30d4645e4eab1f54561b487d1ec7
 Source1:       %{name}.init
 Source2:       %{name}-relay.init
 Source3:       %{name}-relay.sysconfig
@@ -24,8 +24,7 @@ Patch1:               %{name}-ldap.patch
 Patch2:                %{name}-ldap1.patch
 Patch3:                %{name}-client-script-redhat.patch
 Patch4:                %{name}-3.0.3-x-option.patch
-Patch5:                %{name}-typo.patch
-Patch6:                %{name}-arg-concat.patch
+Patch5:                %{name}-arg-concat.patch
 URL:           http://www.isc.org/sw/dhcp/
 BuildRequires: groff
 %{?with_ldap:BuildRequires:    openldap-devel}
@@ -133,9 +132,9 @@ install %{SOURCE4} .
 %{?with_ldap:%patch2 -p1}
 %patch3 -p1
 # WTF is this?
-#%patch4 -p1
+# This is a patch from dhcdbd
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 # NOTE: this is not autoconf configure - do not change it to %%configure