diff -r 4f133201e207 -r 4667f24fe848 iptables/iptables.spec --- a/iptables/iptables.spec Fri Mar 11 21:30:26 2011 +0100 +++ b/iptables/iptables.spec Fri Mar 11 21:36:51 2011 +0100 @@ -1,14 +1,15 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities -Version: 1.4.1.1 -Release: 5.6 +Vendor: Europalab Software +Packager: Michael Schloh von Bennewitz +Distribution: MeeGo Thirdparty +Version: 1.4.10 +Release: 1.0 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config -Patch4: iptables-1.3.8-typo_latter.patch -Patch5: iptables-1.4.1.1-cloexec.patch -Patch8: iptables-1.4.1-nf_ext_init.patch -Patch9: iptables-1.4.1.1-tos_value_mask.patch +Patch1: iptables-1.4.10-cloexec.patch +Patch2: iptables-1.4.10-nf_ext_init.patch Group: System/Base URL: http://www.netfilter.org/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -25,6 +26,9 @@ %package ipv6 Summary: IPv6 support for iptables +Vendor: Europalab Software +Packager: Michael Schloh von Bennewitz +Distribution: MeeGo Thirdparty Group: System/Base Requires: %{name} = %{version}-%{release} Requires(post): chkconfig @@ -41,8 +45,12 @@ %package devel Summary: Development package for iptables +Vendor: Europalab Software +Packager: Michael Schloh von Bennewitz +Distribution: MeeGo Thirdparty Group: System/Base Requires: %{name} = %{version}-%{release} +Requires: %{name}-ipv6 = %{version}-%{release} %description devel iptables development headers and libraries. @@ -52,17 +60,15 @@ %prep %setup -q -%patch4 -p1 -b .typo_latter -%patch5 -p1 -b .cloexec -%patch8 -p1 -b .nf_ext_init -%patch9 -p1 -b .tos_value_mask +%patch1 -p0 -b .cloexec +%patch2 -p0 -b .nf_ext_init # fix constructor names, see also nf_ext_init patch perl -pi -e "s/void _init\(/void __attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c perl -pi -e "s/^_init\(/__attribute\(\(constructor\)\) nf_ext_init\(/g" extensions/*.c %build -./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 +./configure --bindir=/bin --sbindir=/sbin --sysconfdir=/etc --libdir=/%{_libdir} --libexecdir=/%{_lib} --mandir=%{_mandir} --includedir=%{_includedir} --with-kernel=/usr --with-kbuild=/usr --with-ksource=/usr make %install @@ -70,9 +76,6 @@ make install DESTDIR=%{buildroot} -# install iptc devel library -install -m 644 libiptc/libiptc.a %{buildroot}/%{_libdir} - # install init scripts and configuration files install -d -m 755 $RPM_BUILD_ROOT/etc/rc.d/init.d install -c -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iptables @@ -96,6 +99,10 @@ %dir /%{_lib}/xtables /%{_lib}/xtables/libipt* /%{_lib}/xtables/libxt* +%{_libdir}/libxtables.* +%{_libdir}/libip4tc.* +%dir %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/xtables.pc %files ipv6 %defattr(-,root,root) @@ -105,17 +112,20 @@ /bin/iptables-xml %{_mandir}/man8/ip6tables* /%{_lib}/xtables/libip6t* +%{_libdir}/libip6tc.* %files devel %defattr(-,root,root) %{_includedir}/*.h %dir %{_includedir}/libiptc %{_includedir}/libiptc/*.h -%{_libdir}/libipq.a -%{_libdir}/libiptc.a -%{_mandir}/man3/* +%{_libdir}/libiptc.* +%dir %{_libdir}/pkgconfig +%{_libdir}/pkgconfig/libiptc.pc %changelog +* Wed Dec 1 2010 Michael Schloh von Bennewitz - 1.4.10 +- update to new version 1.4.10 * Tue Jan 19 2010 Auke Kok - 1.4.1.1 - remove startup symlinks, do not start iptables{,6} up by default * Tue Jan 27 2009 Anas Nashif 1.4.1.1