rpms/openswan/F-12 openswan-setup.patch, NONE, 1.1 openswan.spec, 1.83, 1.84

[avesh agarwal]

Author: avesh

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

Modified Files:
	openswan.spec 
Added Files:
	openswan-setup.patch 
Log Message:
* Mon Feb 8 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.24-2
- Modified summary in spec file
- Replaced buildroot with RPM_BUILD_ROOT in spec file
- Included html files in the doc package
- Patch for disabling openswan startup at the system
  boot by default


openswan-setup.patch:
 setup.in |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE openswan-setup.patch ---
--- openswan-2.6.24-orig/programs/setup/setup.in	2010-01-09 20:34:38.000000000 -0500
+++ openswan-2.6.24/programs/setup/setup.in	2010-02-08 14:10:37.000000000 -0500
@@ -5,8 +5,6 @@
 # Provides:          openswan
 # Required-Start:    $network $syslog $named
 # Required-Stop:     $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
 # Short-Description: Start Openswan IPsec at boot time
 # Description:       Enable automatic key management for IPsec (KLIPS and NETKEY)
 ### END INIT INFO


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/openswan.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- openswan.spec	8 Feb 2010 17:11:52 -0000	1.83
+++ openswan.spec	8 Feb 2010 20:31:16 -0000	1.84
@@ -4,11 +4,11 @@
 %define nss_version 3.12.3-2
 %define fipscheck_version 1.2.0-1
 
-Summary: Openswan IPSEC implementation
+Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
 Name: openswan
 Version: 2.6.24
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{version}.tar.gz
@@ -20,6 +20,7 @@ Patch2: openswan-2.6-selinux.patch
 Patch3: openswan-2.6.24-nspr.patch
 Patch4: openswan-ipsec-help.patch
 Patch5: openswan-2.6.24-warnings.patch
+Patch6: openswan-setup.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +47,7 @@ Provides: ipsec-userland = %{version}-%{
 #Requires: ipsec-kernel
 
 %package doc
-Summary: Openswan IPSEC full documentation
+Summary: Full documentation of Openswan IPSEC implementation
 Group: System Environment/Daemons
 
 %description
@@ -79,6 +80,7 @@ find doc -name .gitignore -print0 | xarg
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 
@@ -150,49 +152,48 @@ FS=$(pwd)
 %endif
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 %{__make} \
-  DESTDIR=%{buildroot} \
+  DESTDIR=$RPM_BUILD_ROOT \
   INC_USRLOCAL=%{_prefix} \
   FINALLIBDIR=%{_libexecdir}/ipsec \
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
-  MANTREE=%{buildroot}%{_mandir} \
+  MANTREE=$RPM_BUILD_ROOT%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
   install
 FS=$(pwd)
-rm -rf %{buildroot}/usr/share/doc/openswan
+rm -rf $RPM_BUILD_ROOT/usr/share/doc/openswan
 
 # ipsec and setup both installed by default - they are identical
-rm -f %{buildroot}/etc/rc.d/init.d/setup
-rm -f %{buildroot}/usr/share/man/man3/*
-install -d -m 0700 %{buildroot}%{_localstatedir}/run/pluto
-install -d %{buildroot}%{_sbindir}
-find %{buildroot}/etc/ipsec.d -type f -exec chmod 644 {} \;
+rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/setup
+rm -f $RPM_BUILD_ROOT/usr/share/man/man3/*
+install -d -m 0700 $RPM_BUILD_ROOT%{_localstatedir}/run/pluto
+install -d $RPM_BUILD_ROOT%{_sbindir}
+find $RPM_BUILD_ROOT/etc/ipsec.d -type f -exec chmod 644 {} \;
 
-mkdir -p %{buildroot}%{_sysconfdir}
-install -m 600 %{SOURCE2} %{buildroot}%{_sysconfdir}/ipsec.conf
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+install -m 600 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ipsec.conf
 
-sed -i -e 's#/usr/lib/#%{_libexecdir}/#g' %{buildroot}%{_initrddir}/ipsec
+sed -i -e 's#/usr/lib/#%{_libexecdir}/#g' $RPM_BUILD_ROOT%{_initrddir}/ipsec
 
-echo "include /etc/ipsec.d/*.secrets" > %{buildroot}%{_sysconfdir}/ipsec.secrets
+echo "include /etc/ipsec.d/*.secrets" > $RPM_BUILD_ROOT%{_sysconfdir}/ipsec.secrets
 
-chmod a-x %{buildroot}%{_mandir}/*/*
+chmod a-x $RPM_BUILD_ROOT%{_mandir}/*/*
 
 # nuke duplicate docs to save space.  this leaves html and ps
 rm -f doc/HOWTO.pdf doc/HOWTO.txt
 
-rm -fr %{buildroot}/etc/rc.d/rc*
+rm -fr $RPM_BUILD_ROOT/etc/rc.d/rc*
 
-rm -fr %{buildroot}%{_sysconfdir}/ipsec.d/examples
+rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/ipsec.d/examples
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root)
 %doc doc/README.* doc/CHANGES.* doc/CREDITS.* doc/2.6.known-issues
-%doc doc/examples doc/std doc/quickstarts
-#%doc doc/examples doc/std doc/quickstarts doc/example-configs
+%doc doc/examples doc/std doc/quickstarts doc/*.html
 
 %files 
 %defattr(-,root,root)
@@ -226,6 +227,13 @@ fi
 chkconfig --add ipsec || :
 
 %changelog
+* Mon Feb 8 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.24-2
+- Modified summary in spec file
+- Replaced buildroot with RPM_BUILD_ROOT in spec file
+- Included html files in the doc package
+- Patch for disabling openswan startup at the system
+  boot by default
+
 * Mon Feb 8 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.24-1
 - New upstream release
 - Cisco interop patches