rpms/openswan/devel ipsec.conf,1.4,1.5 openswan.spec,1.68,1.69

[avesh agarwal]

Author: avesh

Update of /cvs/pkgs/rpms/openswan/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv703

Modified Files:
	ipsec.conf openswan.spec 
Log Message:
* Tue Oct 13 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.18-2
- 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)	



Index: ipsec.conf
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/ipsec.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ipsec.conf	6 Oct 2008 19:30:22 -0000	1.4
+++ ipsec.conf	13 Oct 2008 17:07:16 -0000	1.5
@@ -14,6 +14,8 @@
 	# For Red Hat Enterprise Linux and Fedora, leave protostack=netkey
 	protostack=netkey
 	nat_traversal=yes
+	virtual_private=
+	oe=off
 	# Enable this if you see "failed to find any available worker"
 	nhelpers=0
 


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- openswan.spec	6 Oct 2008 19:30:22 -0000	1.68
+++ openswan.spec	13 Oct 2008 17:07:16 -0000	1.69
@@ -2,7 +2,7 @@
 Name: openswan
 Version: 2.6.18
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -11,13 +11,12 @@
 
 Patch1: openswan-2.6.16-examples.patch
 Patch2: openswan-2.6-relpath.patch
-Patch3: openswan-2.6-noxmlto.patch
-Patch4: openswan-2.6-selinux.patch
-Patch5: openswan-2.6.16-initscript-correction.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 
 %patch2 -p1 -b .relpath
-%patch3 -p1 -b .noxmlto
-%patch4 -p1 -b .selinux
-%patch5 -p1
+%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
@@ -150,6 +145,15 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Tue Oct 13 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.18-2
+- 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)	
+
 * Tue Oct 06 2008 Avesh Agarwal <avagarwa at redhat.com> - 2.6.18-1
 - new upstream release
 - modified default ipsec.conf to address rhbz#463931