rpms/openswan/devel .cvsignore, 1.16, 1.17 openswan.spec, 1.56, 1.57 sources, 1.15, 1.16 openswan-2.6-noslash.patch, 1.2, NONE

[Steve Conklin (sconklin)]

Author: sconklin

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27404

Modified Files:
	.cvsignore openswan.spec sources 
Removed Files:
	openswan-2.6-noslash.patch 
Log Message:
Incorporate latest upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	11 Jan 2008 18:33:42 -0000	1.16
+++ .cvsignore	28 Jan 2008 21:51:54 -0000	1.17
@@ -1,2 +1,3 @@
 openswan-2.6.02.tar.gz
 openswan-2.6.03.tar.gz
+openswan-2.6.04.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- openswan.spec	24 Jan 2008 21:07:42 -0000	1.56
+++ openswan.spec	28 Jan 2008 21:51:54 -0000	1.57
@@ -1,8 +1,8 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.03
+Version: 2.6.04
 
-Release: 9%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -13,9 +13,8 @@
 Patch: openswan-2.6-examples.patch
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-noxmlto.patch
-Patch3: openswan-2.6-noslash.patch
-Patch4: openswan-2.6-cleanbarf.patch
-Patch5: openswan-2.6-intwarning.patch
+Patch3: openswan-2.6-cleanbarf.patch
+Patch4: openswan-2.6-intwarning.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,9 +58,9 @@
 %patch -p1
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .noxmlto
-%patch3 -p1 -b .noslash
-%patch4 -p1 -b .cleanbarf
-%patch5 -p1 -b .interface
+#%patch3 -p1 -b .noslash
+%patch3 -p1 -b .cleanbarf
+%patch4 -p1 -b .interface
 
 %build
 
@@ -152,6 +151,9 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Jan 28 2008 Steve Conklin <sconklin at redhat.com> - 2.6.04-1
+- Move to new upstream source
+
 * Thu Jan 24 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-9
 - Added af_key module load to init script
 - Removed spurious warning about interfaces=


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	11 Jan 2008 18:33:42 -0000	1.15
+++ sources	28 Jan 2008 21:51:54 -0000	1.16
@@ -1 +1 @@
-b78c5f7d4eb1d6fc9b7c006affc3e61b  openswan-2.6.03.tar.gz
+80b169354104d0b2d2a3cfa894dd769c  openswan-2.6.04.tar.gz


--- openswan-2.6-noslash.patch DELETED ---