rpms/openswan/devel openswan.spec,1.21,1.22

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/openswan/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9046

Modified Files:
	openswan.spec 
Log Message:
- version 2.4.2dr1


Index: openswan.spec
===================================================================
RCS file: /cvs/dist/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- openswan.spec	13 Sep 2005 14:24:05 -0000	1.21
+++ openswan.spec	25 Oct 2005 12:18:38 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.4.0
-%define ourrelease 1
+Version: 2.4.2
+%define ourrelease 0.dr1.1
 
 %define with_klips 0
 
@@ -12,7 +12,7 @@
 %endif
 
 %if %{with_klips}
-%define defkv 2.6.10-1.1076_FC4
+%define defkv 2.6.11-1.1369_FC4
 # The default kernel version to build for is the latest of
 # the installed kernel-source RPMs.
 # This can be overridden by "--define 'kversion x.x.x-y.y.y'"
@@ -22,6 +22,8 @@
 %endif
 
 %define srcpkgver	%(echo %{version} | tr -s '_' '-')
+%define srcpkgver 2.4.2dr1
+
 %define debug_package %{nil}
 Release: %{ourrelease}
 License: GPL
@@ -32,15 +34,10 @@
 Source3: ipsec.conf
 
 Patch1: openswan-2.3.0-pie.patch
-Patch2: openswan-2.3.0-fix_status.patch
-Patch3: openswan-2.3.0-wall.patch
 
 # http://bugs.xelerance.com/view.php?id=231
 Patch4: openswan-2.3.1-nat_t_aggr.patch
 
-# http://bugs.xelerance.com/view.php?id=292
-Patch5: openswan-2.3.1-iproute2.patch
-
 Patch6: openswan-2.3.1-cisco.patch
 
 Group: System Environment/Daemons
@@ -74,7 +71,7 @@
 Requires: kernel = %{kversion}
 # do not make the dependancy circular for now.
 Requires: ipsec-userland
-BuildRequires: kernel = %{kversion} kernel-smp = %{kversion}
+BuildRequires: kernel = %{kversion} kernel-smp = %{kversion} kernel-devel = %{kversion}
 %endif
 
 %if %{with_klips}
@@ -112,10 +109,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q -n openswan-%{srcpkgver}
 #%patch1 -p1 -b .pie
-#%patch2 -p1 -b .status
-#%patch3 -p1 -b .wall
 %patch4 -p1 -b .nat_t
-#%patch5 -p1 -b .iproute2
 %patch6 -p1 -b .cisco
 
 %build
@@ -258,6 +252,9 @@
 exit 0
 
 %changelog
+* Tue Oct 25 2005 Harald Hoyer <harald at redhat.com> - 2.4.2-0.dr1.1
+- version 2.4.2dr1
+
 * Tue Sep 13 2005 Harald Hoyer <harald at redhat.com> - 2.4.0-1
 - version 2.4.0