This commit was manufactured by cvs2git to create branch 'RA-branch'.

Sprout from master 2002-08-29 10:36:37 UTC Jakub Bogusz <qboosh@pld-linux.org> '- compilation fix for alpha'
Cherrypick from unlabeled-1.28.2 2003-03-23 23:40:21 UTC kloczek <kloczek@pld-linux.org> '- release 13: rebuild against kernel 2.2.25.':
    cipe.spec -> 1.28.2.1

diff --git a/cipe.spec b/cipe.spec
index 1b46797ece8dd73b281aaca372be5f038bbd7626..48624f4740e87dd751af1ba7fe6aded7eb53d297 100644 (file)
--- a/cipe.spec
+++ b/cipe.spec
@@ -2,7 +2,7 @@ Summary:        CIPE - encrypted IP over UDP tunneling
 Summary(pl):   CIPE - szyfrowany tunel IP po UDP
 Name:          cipe
 Version:       1.5.2
-%define                _rel 5
+%define        _rel    13
 Release:       %{_rel}
 License:       GPL
 Group:         Networking/Daemons
@@ -12,11 +12,12 @@ Patch0:             %{name}-autoconf.patch
 Patch1:                %{name}-makefile.patch
 Patch2:                %{name}-pkcipe-real-peer.patch
 Patch3:                %{name}-get_fast_time.patch
+Patch4:                %{name}-alpha.patch
 %{!?_without_dist_kernel:BuildRequires: kernel-headers}
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.6
-BuildRequires: %{_bindir}/openssl
+BuildRequires: /usr/bin/openssl
 BuildRequires:  %{kgcc_package}
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,7 +41,7 @@ podobnych zastosowaniach.
 Summary:       The PKCIPE public key tool for CIPE
 Summary(pl):   PKCIPE - narzêdzie do wykorzystania kluczy publicznych w CIPE
 Group:         Networking/Daemons
-Prereq:                %{_bindir}/openssl
+Prereq:                /usr/bin/openssl
 Requires:      %{name} = %{version}
 Obsoletes:     %{name}-pkcipe
 
@@ -133,10 +134,11 @@ skompilowany dla %{_kernel_ver}-smp.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 mv -f conf/aclocal.m4 conf/acinclude.m4
-aclocal -I conf --output=conf/aclocal.m4
+%{__aclocal} -I conf --output=conf/aclocal.m4
 %{__autoconf} --include conf/
 
 %configure \
@@ -148,7 +150,7 @@ aclocal -I conf --output=conf/aclocal.m4
 mkdir modules/
 mv -f */cipcb.o modules/
 
-make clean
+%{__make} clean
 
 DEFS="-D__SMP__ -D__KERNEL_SMP=1" \
 %configure \
@@ -176,8 +178,6 @@ install */ciped-cb $RPM_BUILD_ROOT%{_sbindir}
 install cipe.info $RPM_BUILD_ROOT%{_infodir}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/pkcipe
 
-gzip -9nf README* tcpdump.patch CHANGES
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -216,7 +216,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz samples
+%doc README* tcpdump.patch CHANGES samples
 %{_infodir}/*
 %attr(755,root,root) %{_sbindir}/ciped-cb
 %dir %{_sysconfdir}/cipe
@@ -234,8 +234,8 @@ fi
 
 %files -n kernel-cipe
 %defattr(644,root,root,755)
-%attr(600,root,root) /lib/modules/%{_kernel_ver}/misc/cipcb.o
+%attr(600,root,root) /lib/modules/%{_kernel_ver}/misc/cipcb.o*
 
 %files -n kernel-smp-cipe
 %defattr(644,root,root,755)
-%attr(600,root,root) /lib/modules/%{_kernel_ver}smp/misc/cipcb.o
+%attr(600,root,root) /lib/modules/%{_kernel_ver}smp/misc/cipcb.o*