SPECS: ipp2p.spec - alt kernel fixes from AC-branch

[glen]

Author: glen                         Date: Thu Apr  3 20:52:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alt kernel fixes from AC-branch

---- Files affected:
SPECS:
   ipp2p.spec (1.72 -> 1.73) 

---- Diffs:

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.72 SPECS/ipp2p.spec:1.73
--- SPECS/ipp2p.spec:1.72	Thu Mar 27 21:56:04 2008
+++ SPECS/ipp2p.spec	Thu Apr  3 22:52:19 2008
@@ -5,27 +5,33 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
-%bcond_with	grsec_kernel	# build for kernel-grsecurity
-#
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
+
+%ifarch sparc
+%undefine	with_smp
 %endif
-#
-%define	iptables_ver	1.3.3
 
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+
+%define		iptables_ver	1.3.3
+%define		pname	ipp2p
 %define		rel	14
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl.UTF-8):	IPP2P - rozszerzenie filtra pakietów identyfikujące ruch P2P
-Name:		ipp2p
+Name:		%{pname}%{_alt_kernel}
 Version:	0.8.2
 Release:	%{rel}
 Epoch:		1
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://www.ipp2p.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://www.ipp2p.org/downloads/%{pname}-%{version}.tar.gz
 # Source0-md5:	9dd745830f302d70d0b728013c1d6a0c
-Patch0:		%{name}-2.6.19.patch
-Patch1:		%{name}-2.6.21.patch
+Patch0:		%{pname}-2.6.19.patch
+Patch1:		%{pname}-2.6.21.patch
 URL:		http://www.ipp2p.org/
 %{?with_userspace:BuildRequires:	iptables-devel >= 1.3.3}
 %if %{with kernel}
@@ -159,7 +165,7 @@
 
 %if %{with kernel}
 # kernel module(s)
-%build_kernel_modules -m ipt_%{name}
+%build_kernel_modules -m ipt_%{pname}
 %endif
 
 %install
@@ -167,11 +173,11 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/iptables
-install libipt_%{name}.so $RPM_BUILD_ROOT%{_libdir}/iptables
+install libipt_%{pname}.so $RPM_BUILD_ROOT%{_libdir}/iptables
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m ipt_%{name} -d kernel/net/ipv4/netfilter
+%install_kernel_modules -m ipt_%{pname} -d kernel/net/ipv4/netfilter
 %endif
 
 %clean
@@ -186,7 +192,7 @@
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-net-ipp2p
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{name}.ko*
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{pname}.ko*
 %endif
 
 %if %{with userspace}
@@ -201,6 +207,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73  2008-04-03 20:52:19  glen
+- alt kernel fixes from AC-branch
+
 Revision 1.72  2008-03-27 20:56:04  glen
 - rel 14 (2.6.22.19-5)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.72&r2=1.73&f=u