1.1 --- a/iptables/iptables.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/iptables/iptables.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,14 +1,15 @@
1.4 Name: iptables
1.5 Summary: Tools for managing Linux kernel packet filtering capabilities
1.6 -Version: 1.4.1.1
1.7 -Release: 5.6
1.8 +Vendor: Europalab Software
1.9 +Packager: Michael Schloh von Bennewitz
1.10 +Distribution: MeeGo Thirdparty
1.11 +Version: 1.4.10
1.12 +Release: 1.0
1.13 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
1.14 Source1: iptables.init
1.15 Source2: iptables-config
1.16 -Patch4: iptables-1.3.8-typo_latter.patch
1.17 -Patch5: iptables-1.4.1.1-cloexec.patch
1.18 -Patch8: iptables-1.4.1-nf_ext_init.patch
1.19 -Patch9: iptables-1.4.1.1-tos_value_mask.patch
1.20 +Patch1: iptables-1.4.10-cloexec.patch
1.21 +Patch2: iptables-1.4.10-nf_ext_init.patch
1.22 Group: System/Base
1.23 URL: http://www.netfilter.org/
1.24 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
1.25 @@ -25,6 +26,9 @@
1.26
1.27 %package ipv6
1.28 Summary: IPv6 support for iptables
1.29 +Vendor: Europalab Software
1.30 +Packager: Michael Schloh von Bennewitz
1.31 +Distribution: MeeGo Thirdparty
1.32 Group: System/Base
1.33 Requires: %{name} = %{version}-%{release}
1.34 Requires(post): chkconfig
1.35 @@ -41,8 +45,12 @@
1.36
1.37 %package devel
1.38 Summary: Development package for iptables
1.39 +Vendor: Europalab Software
1.40 +Packager: Michael Schloh von Bennewitz
1.41 +Distribution: MeeGo Thirdparty
1.42 Group: System/Base
1.43 Requires: %{name} = %{version}-%{release}
1.44 +Requires: %{name}-ipv6 = %{version}-%{release}
1.45
1.46 %description devel
1.47 iptables development headers and libraries.
1.48 @@ -52,17 +60,15 @@
1.49
1.50 %prep
1.51 %setup -q
1.52 -%patch4 -p1 -b .typo_latter
1.53 -%patch5 -p1 -b .cloexec
1.54 -%patch8 -p1 -b .nf_ext_init
1.55 -%patch9 -p1 -b .tos_value_mask
1.56 +%patch1 -p0 -b .cloexec
1.57 +%patch2 -p0 -b .nf_ext_init
1.58
1.59 # fix constructor names, see also nf_ext_init patch
1.60 perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
1.61 perl -pi -e "s/^_init\(/__attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c
1.62
1.63 %build
1.64 -./configure --enable-devel --enable-libipq --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
1.65 +./configure --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr
1.66 make
1.67
1.68 %install
1.69 @@ -70,9 +76,6 @@
1.70
1.71 make install DESTDIR=%{buildroot}
1.72
1.73 -# install iptc devel library
1.74 -install -m 644 libiptc/libiptc.a %{buildroot}/%{_libdir}
1.75 -
1.76 # install init scripts and configuration files
1.77 install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d
1.78 install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables
1.79 @@ -96,6 +99,10 @@
1.80 %dir /%{_lib}/xtables
1.81 /%{_lib}/xtables/libipt*
1.82 /%{_lib}/xtables/libxt*
1.83 +%{_libdir}/libxtables.*
1.84 +%{_libdir}/libip4tc.*
1.85 +%dir %{_libdir}/pkgconfig
1.86 +%{_libdir}/pkgconfig/xtables.pc
1.87
1.88 %files ipv6
1.89 %defattr(-,root,root)
1.90 @@ -105,17 +112,20 @@
1.91 /bin/iptables-xml
1.92 %{_mandir}/man8/ip6tables*
1.93 /%{_lib}/xtables/libip6t*
1.94 +%{_libdir}/libip6tc.*
1.95
1.96 %files devel
1.97 %defattr(-,root,root)
1.98 %{_includedir}/*.h
1.99 %dir %{_includedir}/libiptc
1.100 %{_includedir}/libiptc/*.h
1.101 -%{_libdir}/libipq.a
1.102 -%{_libdir}/libiptc.a
1.103 -%{_mandir}/man3/*
1.104 +%{_libdir}/libiptc.*
1.105 +%dir %{_libdir}/pkgconfig
1.106 +%{_libdir}/pkgconfig/libiptc.pc
1.107
1.108 %changelog
1.109 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 1.4.10
1.110 +- update to new version 1.4.10
1.111 * Tue Jan 19 2010 Auke Kok <auke-jan.h.kok@intel.com> - 1.4.1.1
1.112 - remove startup symlinks, do not start iptables{,6} up by default
1.113 * Tue Jan 27 2009 Anas Nashif <anas.nashif@intel.com> 1.4.1.1
