rpms/openswan/devel openswan-2.6-noxmlto.patch, NONE, 1.1 openswan.spec, 1.49, 1.50

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6-noxmlto.patch 
Log Message:
more rpm cleanup


openswan-2.6-noxmlto.patch:

--- NEW FILE openswan-2.6-noxmlto.patch ---
--- openswan-2.6.03/Makefile.inc.spc	2008-01-17 12:31:57.000000000 -0600
+++ openswan-2.6.03/Makefile.inc	2008-01-17 12:33:23.000000000 -0600
@@ -208,7 +208,7 @@
 	fi)
 
 # look for XMLTO command
-XMLTO?=$(shell which xmlto|grep /)
+#XMLTO?=$(shell which xmlto|grep /)
 
 #
 # default number of bits for ipsec newhostkey


Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- openswan.spec	17 Jan 2008 14:49:34 -0000	1.49
+++ openswan.spec	17 Jan 2008 18:58:20 -0000	1.50
@@ -1,7 +1,6 @@
 Summary: Openswan IPSEC implementation
 Name: openswan
 Version: 2.6.03
-#%define srcpkgver	%(echo %{version} | tr -s '_' '-')
 %define srcpkgver %{version}
 
 %define do_userland %{nil}
@@ -11,8 +10,8 @@
 
 %define debug_package %{nil}
 
-Release: 3%{?dist}
-License: -GPL
+Release: 4%{?dist}
+License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
 
@@ -21,10 +20,11 @@
 
 Patch: openswan-2.6-examples.patch
 Patch1: openswan-2.6-relpath.patch
+Patch2: openswan-2.6-noxmlto.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gmp-devel bison flex man xmlto
+BuildRequires: gmp-devel bison flex man
 Requires(post): coreutils bash
 Requires(preun): initscripts chkconfig
 Requires(post): /sbin/chkconfig
@@ -62,6 +62,7 @@
 
 %patch -p1
 %patch1 -p1 -b .relpath
+%patch2 -p1 -b .noxmlto
 
 %build
 
@@ -71,6 +72,7 @@
   USERLINK="-g -pie" \
   INC_USRLOCAL=%{_prefix} \
   FINALLIBDIR=%{_libdir}/ipsec \
+  IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
   USE_LWRES=false \
@@ -84,6 +86,7 @@
   DESTDIR=%{buildroot} \
   INC_USRLOCAL=%{_prefix} \
   FINALLIBDIR=%{_libdir}/ipsec \
+  IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{buildroot}%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
   USE_LWRES=false \
@@ -91,6 +94,7 @@
 FS=$(pwd)
 rm -rf %{buildroot}/usr/share/doc/openswan
 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 {} \;
@@ -128,7 +132,7 @@
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipsec.d/policies/*
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/policies
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
-%config(noreplace) %{_initrddir}/ipsec
+%{_initrddir}/ipsec
 %{_libdir}/ipsec
 %{_sbindir}/ipsec
 %{_libexecdir}/ipsec
@@ -150,6 +154,11 @@
 chkconfig --add ipsec || :
 
 %changelog
+* Thu Jan 17 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-4
+- Removed use of xmlto and the BuildRequires
+- moved scripts from /usr/lib to /usr/libexec
+- removed man3 pages for libopenswan functions (we don't deliver)
+
 * Wed Jan 16 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-3
 - Removed %{?_smp_mflags} from %build
 - Added BuildRequires for xmlto