rpms/openswan/F-9 .cvsignore, 1.20, 1.21 openswan.spec, 1.63, 1.64 sources, 1.20, 1.21 openswan-2.6-examples.patch, 1.2, NONE openswan-2.6-intwarning.patch, 1.1, NONE

[avesh agarwal]

Author: avesh

Update of /cvs/pkgs/rpms/openswan/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30663

Modified Files:
	.cvsignore openswan.spec sources 
Removed Files:
	openswan-2.6-examples.patch openswan-2.6-intwarning.patch 
Log Message:
* Tue Oct 30 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.18-1
- Addressed some issues related to buzilla 447419
- Added xmlto and bind-devel to BuildRequires 
- Removed the patch openswan-2.6-noxmlto.patch
- Removed the command "rm -rf programs/readwriteconf" from the spec file
  as readwriteconf is used with "make check" for debugging purposes.
- Removed USE_LWRES=false from the spec file as it has been 
  obsolete in upstream (using bind-devel instead)	
- modified default ipsec.conf to address rhbz#463931
- added initscript patch to prevent openswan service start by default



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2008 15:41:12 -0000	1.20
+++ .cvsignore	25 Nov 2008 21:15:42 -0000	1.21
@@ -4,3 +4,4 @@
 openswan-2.6.05rh.tar.gz
 openswan-2.6.07.tar.gz
 openswan-2.6.09.tar.gz
+openswan-2.6.18.tar.gz


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-9/openswan.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- openswan.spec	6 Jun 2008 19:30:52 -0000	1.63
+++ openswan.spec	25 Nov 2008 21:15:43 -0000	1.64
@@ -1,6 +1,6 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
-Version: 2.6.14
+Version: 2.6.18
 
 Release: 1%{?dist}
 License: GPLv2+
@@ -9,15 +9,14 @@
 
 Source2: ipsec.conf
 
-Patch1: openswan-2.6-examples.patch
+Patch1: openswan-2.6.16-examples.patch
 Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6-noxmlto.patch
-Patch4: openswan-2.6-intwarning.patch
-Patch5: openswan-2.6-selinux.patch
+Patch3: openswan-2.6-selinux.patch
+Patch4: openswan-2.6.16-initscript-correction.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gmp-devel bison flex man
+BuildRequires: gmp-devel bison flex man xmlto bind-devel
 Requires(post): coreutils bash
 Requires(preun): initscripts chkconfig
 Requires(post): /sbin/chkconfig
@@ -52,13 +51,11 @@
 %setup -q -n openswan-%{version}
 find doc/examples -type f -print0 | xargs -0 chmod a-x
 find doc -name .gitignore -print0 | xargs -0 rm -v
-rm -rf programs/readwriteconf
 
-%patch1 -p1
+%patch1 -p1 
 %patch2 -p1 -b .relpath
-%patch3 -p1 -b .noxmlto
-%patch4 -p1 -b .interface
-%patch5 -p1 -b .selinux
+%patch3 -p1 -b .selinux
+%patch4 -p1
 
 %build
 
@@ -71,7 +68,6 @@
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
-  USE_LWRES=false \
   programs
 FS=$(pwd)
 
@@ -85,7 +81,6 @@
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{buildroot}%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
-  USE_LWRES=false \
   install
 FS=$(pwd)
 rm -rf %{buildroot}/usr/share/doc/openswan
@@ -111,7 +106,7 @@
 
 rm -fr %{buildroot}/etc/rc.d/rc*
 
-rm -f %{buildroot}%{_sysconfdir}/ipsec.d/examples
+rm -fr %{buildroot}%{_sysconfdir}/ipsec.d/examples
 
 %clean
 rm -rf %{buildroot}
@@ -150,6 +145,17 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Tue Oct 30 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.18-1
+- Addressed some issues related to buzilla 447419
+- Added xmlto and bind-devel to BuildRequires 
+- Removed the patch openswan-2.6-noxmlto.patch
+- Removed the command "rm -rf programs/readwriteconf" from the spec file
+  as readwriteconf is used with "make check" for debugging purposes.
+- Removed USE_LWRES=false from the spec file as it has been 
+  obsolete in upstream (using bind-devel instead)	
+- modified default ipsec.conf to address rhbz#463931
+- added initscript patch to prevent openswan service start by default
+
 * Fri Jun 06 2008 Steve Grubb <sgrubb at redhat.com> - 2.6.14-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	6 Jun 2008 19:30:52 -0000	1.20
+++ sources	25 Nov 2008 21:15:43 -0000	1.21
@@ -1 +1 @@
-44dc3cb98b9cb4e3fa03b82967d08b78  openswan-2.6.14.tar.gz
+b485b38b1074155bc337f80557c24c0d  openswan-2.6.18.tar.gz


--- openswan-2.6-examples.patch DELETED ---


--- openswan-2.6-intwarning.patch DELETED ---