- 2.0rc2 - made by Maciej Świniarski <luzik@ds.pg.gda.pl>

Changed files:
    freeswan.spec -> 1.41

diff --git a/freeswan.spec b/freeswan.spec
index db737d49f07308b956c692b5f0cce14c0d0f1232..d54e3c5f57f073bac53ab02cd5cb10f4e2a212b7 100644 (file)
--- a/freeswan.spec
+++ b/freeswan.spec
@@ -1,33 +1,28 @@
 # Conditional builds
-# _without_x509
-# _with_smp
-# _with_oldconfig
-
-%define x509ver                 x509patch-0.9.11
+# _without_x509                - without x509 support
+# _without_dist_kernel - without distribution kernel
 
+%define _rc            rc2
+%define x509ver                 x509-1.2.1
 Summary:       Free IPSEC implemetation
 Summary(pl):   Publicznie dostêpna implementacja IPSEC
 Name:          freeswan
-Version:       1.97
-Release:       1
+Version:       2.00
+Release:       0.%{_rc}.1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       ftp://ftp.xs4all.nl/pub/crypto/%{name}/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.xs4all.nl/pub/crypto/%{name}/development/%{name}-%{version}-%{_rc}.tar.gz
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.tar.bz2
-Source2:       http://www.strongsec.com/%{name}/%{x509ver}-%{name}-%{version}.tar.gz
-Source3:       %{name}-kernel.config
-Patch0:                %{name}-Makefile.patch
-Patch1:                %{name}-manlink.patch
-Patch2:                %{name}-config.patch
-Patch3:                %{name}-init.patch
-Patch4:                %{name}-keygen.patch
-Patch5:                x509-config.patch
+Source2:       http://www.strongsec.com/%{name}/%{x509ver}-%{name}-%{version}-%{_rc}.tar.gz
+Patch0:                %{name}-showhostkey.patch
+Patch1:                %{name}-init.patch
 URL:           http://www.freeswan.org/
+BuildRequires: gmp-devel
 Prereq:                /sbin/chkconfig
 Prereq:                rc-scripts
-BuildRequires: gmp-devel
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Requires:      gmp
+%{!?_without_dist_kernel:Requires:     kernel(freeswan)}
+BuildRoot:     %{tmpdir}/%{name}-%{version}-%{_rc}-root-%(id -u -n)
 
 %define x509 1
 %{?_without_x509:%define x509 0}
@@ -50,40 +45,46 @@ opcjonalny dla aktualnego IP, w wersji 4.
 FreeS/WAN jest darmow± implementacj± protoko³u IPSEC.
 
 %prep
-%setup  -q -a2
+%setup  -q -a2 -n %{name}-%{version}-%{_rc}
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
-%{?!_without_x509:patch -p1 <%{x509ver}-%{name}-%{version}/freeswan.diff}
-%{?!_without_x509:%patch5 -p1 }
+%{?!_without_x509:patch -p1 <%{x509ver}-%{name}-%{version}-%{_rc}/freeswan.diff}
+#%{?!_without_x509:%patch5 -p1 }
 
 %build
 
 USERCOMPILE="%{rpmcflags}" ; export USERCOMPILE
 OPT_FLAGS="%{rpmcflags}"; export OPT_FLAGS
 CC=%{__cc}; export CC
-%{__make} programs
+%{__make} programs \
+       FINALCONFDIR=%{_sysconfdir}/ipsec \
+       INC_USRLOCAL=/usr \
+       INC_MANDIR=share/man \
+       FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
+       FINALLIBEXECDIR=${_libdir}/ipsec 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ipsec,/etc/rc.d/init.d,/var/run/pluto}
 
 %{__make} install \
-       DESTDIR="$RPM_BUILD_ROOT"
+       DESTDIR="$RPM_BUILD_ROOT" \
+       INC_USRLOCAL=/usr \
+        INC_MANDIR=share/man \
+        FINALCONFDIR=%{_sysconfdir}/ipsec \
+       FINALRCDIR=%{_sysconfdir}/rc.d/init.d \
+       FINALLIBEXECDIR=%{_libdir}/ipsec \
+       FINALEXAMPLECONFDIR=/usr/share/doc/%{name}-%{version}
 
 %if %{x509}
- install -d  $RPM_BUILD_ROOT%{_sysconfdir}/ipsec.d
- for i in crls cacerts private; do
-  install -d  $RPM_BUILD_ROOT%{_sysconfdir}/ipsec.d/$i
+ install -d  $RPM_BUILD_ROOT%{_sysconfdir}/ipsec/ipsec.d
+ for i in crls cacerts private policies; do
+  install -d  $RPM_BUILD_ROOT%{_sysconfdir}/ipsec/ipsec.d/$i
 done
 for i in CHANGES README; do
-  install  %{x509ver}-%{name}-%{version}/$i $i.x509 ;  
-       gzip -9nf $i.x509 ;
-
+  install  %{x509ver}-%{name}-%{version}-%{_rc}/$i $i.x509 ;   
 done
 %endif
 
@@ -117,12 +118,11 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(644,root,root,755)
-%doc README CREDITS CHANGES BUGS \
-          doc/{kernel.notes,impl.notes,examples,prob.report,standards} doc/*.html
-%{?!_without_x509:%doc CHANGES.x509.gz README.x509.gz}
+%doc README CREDITS CHANGES BUGS 
+%doc doc/{kernel.notes,impl.notes,examples,prob.report,standards} doc/*.html
+%{?!_without_x509:%doc CHANGES.x509 README.x509}
 %{_mandir}/man*/*
 %lang(pl) %{_mandir}/pl/man*/*
 %attr(755,root,root) %{_sbindir}/*
@@ -130,10 +130,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ipsec
 %attr(755,root,root) %{_libdir}/ipsec/*
 %attr(751,root,root) %dir %{_sysconfdir}/ipsec
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ipsec/*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ipsec/ipsec.conf
 %if %{x509}
-%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d
-%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/crls
-%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/cacerts
-%attr(0700,root,root) %dir %{_sysconfdir}/ipsec.d/private
+%attr(0700,root,root) %dir %{_sysconfdir}/ipsec/ipsec.d
+%attr(0700,root,root) %dir %{_sysconfdir}/ipsec/ipsec.d/crls
+%attr(0700,root,root) %dir %{_sysconfdir}/ipsec/ipsec.d/cacerts
+%attr(0700,root,root) %dir %{_sysconfdir}/ipsec/ipsec.d/private
+%attr(0700,root,root) %dir %{_sysconfdir}/ipsec/ipsec.d/policies
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ipsec/ipsec.d/policies/*
 %endif