rpms/openswan/devel openswan-2.6-noslash.patch, NONE, 1.1 openswan.spec, 1.51, 1.52

[Steve Conklin (sconklin)]

Author: sconklin

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

Modified Files:
	openswan.spec 
Added Files:
	openswan-2.6-noslash.patch 
Log Message:
more fixes, patch to remove extra slashes from makefile


openswan-2.6-noslash.patch:

--- NEW FILE openswan-2.6-noslash.patch ---
diff -up openswan-2.6.03/lib/libcrypto/Makefile.noslash openswan-2.6.03/lib/libcrypto/Makefile
--- openswan-2.6.03/lib/libcrypto/Makefile.noslash	2008-01-11 01:32:08.000000000 +0100
+++ openswan-2.6.03/lib/libcrypto/Makefile	2008-01-17 23:28:39.000000000 +0100
@@ -32,6 +32,6 @@ def:
 cleanall distclean mostlyclean realclean install programs checkprograms check clean spotless install_file_list:
 	@for d in $(SUBDIRS) ; \
 	do \
-		(cd $$d && $(MAKE) srcdir=${srcdir}/$$d/ OPENSWANSRCDIR=$(OPENSWANSRCDIR) $@ ) || exit 1; \
+		(cd $$d && $(MAKE) srcdir=${srcdir}$$d/ OPENSWANSRCDIR=$(OPENSWANSRCDIR) $@ ) || exit 1; \
 	done; \
 

Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/devel/openswan.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- openswan.spec	17 Jan 2008 19:33:38 -0000	1.51
+++ openswan.spec	18 Jan 2008 01:58:48 -0000	1.52
@@ -8,7 +8,7 @@
 
 %define debug_package %{nil}
 
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Url: http://www.openswan.org/
 Source: openswan-%{srcpkgver}.tar.gz
@@ -19,6 +19,7 @@
 Patch: openswan-2.6-examples.patch
 Patch1: openswan-2.6-relpath.patch
 Patch2: openswan-2.6-noxmlto.patch
+Patch3: openswan-2.6-noslash.patch
 
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +62,7 @@
 %patch -p1
 %patch1 -p1 -b .relpath
 %patch2 -p1 -b .noxmlto
+%patch3 -p1 -b .noslash
 
 %build
 
@@ -69,7 +71,7 @@
   USERCOMPILE="-g %{optflags} -fPIE -pie" \
   USERLINK="-g -pie" \
   INC_USRLOCAL=%{_prefix} \
-  FINALLIBDIR=%{_libdir}/ipsec \
+  FINALLIBDIR=%{_libexecdir}/ipsec \
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
@@ -83,7 +85,7 @@
 %{__make} \
   DESTDIR=%{buildroot} \
   INC_USRLOCAL=%{_prefix} \
-  FINALLIBDIR=%{_libdir}/ipsec \
+  FINALLIBDIR=%{_libexecdir}/ipsec \
   IPSEC_LIBDIR="${IPSEC_LIBDIR-/usr/libexec/ipsec}" \
   MANTREE=%{buildroot}%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
@@ -101,7 +103,7 @@
 install -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/ipsec.conf
 install -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/ipsec
 
-sed -i -e 's#/usr/lib/#%{_libdir}/#g' %{buildroot}%{_initrddir}/ipsec
+sed -i -e 's#/usr/lib/#%{_libexecdir}/#g' %{buildroot}%{_initrddir}/ipsec
 
 echo "include /etc/ipsec.d/*.secrets" > %{buildroot}%{_sysconfdir}/ipsec.secrets
 
@@ -131,7 +133,7 @@
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/policies
 %attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
 %{_initrddir}/ipsec
-%{_libdir}/ipsec
+#%{_libdir}/ipsec
 %{_sbindir}/ipsec
 %{_libexecdir}/ipsec
 %{_mandir}/*/*.gz
@@ -152,7 +154,12 @@
 chkconfig --add ipsec || :
 
 %changelog
-* Thu Jan 17 2008 Steve Conklin <sconklin at qrp.redhat.com> - 2.6.03-5
+* Thu Jan 17 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-6
+- Moved everything else out of /usr/lib
+- Added tmraz's patch to remove extra slashes in makefile
+- Removed macros from changelog entries
+
+* Thu Jan 17 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-5
 - Removed userland macros from spec file
 
 * Thu Jan 17 2008 Steve Conklin <sconklin at redhat.com> - 2.6.03-4
@@ -161,7 +168,7 @@
 - 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
+- Removed _smp_mflags macro from from the spec file build section
 - Added BuildRequires for xmlto
 - Changed License from GPL to GPL+
 - removed klips ifdefs from spec file