Author: qboosh                       Date: Wed Jan 11 10:42:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- optflags, cleanups

---- Files affected:
SPECS:
   openswan.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/openswan.spec
diff -u SPECS/openswan.spec:1.22 SPECS/openswan.spec:1.23
--- SPECS/openswan.spec:1.22    Tue Dec 20 01:07:55 2005
+++ SPECS/openswan.spec Wed Jan 11 11:42:17 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 Summary:       Open Source implementation of IPsec for the Linux operating 
system
 Summary(pl):   Otwarta implementacja IPseca dla systemu operacyjnego Linux
 Name:          openswan
@@ -14,10 +13,6 @@
 Patch0:                %{name}-prefix.patch
 Patch1:                %{name}-bash.patch
 URL:           http://www.openswan.org/
-Obsoletes:     ipsec-tools
-Obsoletes:     strongswan
-Obsoletes:     freeswan
-Provides:      freeswan
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gmp-devel
@@ -28,6 +23,10 @@
 Requires(post,preun):  /sbin/chkconfig
 Requires:      bash
 Requires:      rc-scripts
+Provides:      freeswan
+Obsoletes:     freeswan
+Obsoletes:     ipsec-tools
+Obsoletes:     strongswan
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,7 +51,9 @@
 %{__sed} -i -e "s#/lib/ipsec#/%{_lib}/ipsec#g#" Makefile.inc
 
 %build
-%{__make} programs
+%{__make} programs \
+       CC="%{__cc}" \
+       USERCOMPILE="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +65,18 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ipsec
 %{__sed} -i -e "s#/lib/ipsec#/%{_lib}/ipsec#g#" 
$RPM_BUILD_ROOT/etc/rc.d/init.d/ipsec
 
+for l in `find $RPM_BUILD_ROOT%{_mandir}/man3 -type l` ; do
+       d=`readlink $l`
+       rm -f $l
+       echo ".so $d" > $l
+done
+
+# just man pages converted to HTML
+rm -rf $RPM_BUILD_ROOT%{_docdir}/openswan/*.[358].html
+
+# API not exported - kill for now
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man3
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -93,10 +106,12 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ipsec.conf
 %dir %{_sysconfdir}/ipsec.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ipsec.d/*
-%{_docdir}/openswan
-%{_mandir}/man3/*
 %{_mandir}/man5/*
 %{_mandir}/man8/*
+%{_docdir}/openswan
+
+# devel docs (but no devel libs)
+#%{_mandir}/man3/*
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -104,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/01/11 10:42:17  qboosh
+- optflags, cleanups
+
 Revision 1.22  2005/12/20 00:07:55  glen
 - add CVE refs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openswan.spec?r1=1.22&r2=1.23&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to