[iptables] spec clean up

[Jiří Popelka]

commit ba11125edd372e99d74f01227379832bd7f84c7b
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Jan 9 16:28:18 2014 +0100

    spec clean up

 iptables.spec |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/iptables.spec b/iptables.spec
index ef45fe2..f0655cf 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -13,16 +13,13 @@ Source1: iptables.init
 Source2: iptables-config
 Source3: iptables.service
 Source4: iptables.save-legacy
-Group: System Environment/Base
 URL: http://www.netfilter.org/
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: GPLv2
 # libnfnetlink-devel is requires for nfnl_osf
 BuildRequires: libnfnetlink-devel
 BuildRequires: libselinux-devel
 BuildRequires: kernel-headers
 BuildRequires: systemd
-Conflicts: kernel < 2.4.20
 
 # Virtually provide libxtables.so.9 to be able to create the buildroot.
 # The iproute package is needed by iniscripts. iproute also provides tc, which
@@ -42,7 +39,7 @@ you should install this package.
 %package devel
 Summary: Development package for iptables
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -58,12 +55,10 @@ Requires: %{name} = %{version}-%{release}
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
-Conflicts: systemd < 38
-Conflicts: filesystem < 3
 # provide and obsolete old main package
 Provides: %{name} = 1.4.16.1
 Obsoletes: %{name} <= 1.4.16.1
-# provide and obsolte ipv6 sub package
+# provide and obsolete ipv6 sub package
 Provides: %{name}-ipv6 = 1.4.11.1
 Obsoletes: %{name}-ipv6 <= 1.4.11.1
 
@@ -100,8 +95,6 @@ rm -f include/linux/types.h
 make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
 make install DESTDIR=%{buildroot} 
 # remove la file(s)
 rm -f %{buildroot}/%{_libdir}/*.la
@@ -139,9 +132,6 @@ sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildr
 install -c -m 755 ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save
 
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -157,7 +147,6 @@ rm -rf %{buildroot}
 %systemd_postun_with_restart iptables.service ip6tables.service
 
 %files
-%defattr(-,root,root)
 %doc COPYING INCOMPATIBILITIES
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config
@@ -176,7 +165,6 @@ rm -rf %{buildroot}
 %{_libdir}/libxtables.so.*
 
 %files devel
-%defattr(-,root,root)
 %dir %{_includedir}/iptables
 %{_includedir}/iptables/*.h
 %{_includedir}/*.h
@@ -214,6 +202,7 @@ rm -rf %{buildroot}
 - use systemd macros (#850166)
 - remove scriptlets for migrating to a systemd unit from a SysV initscripts
 - ./configure -> %%configure
+- spec clean up
 
 * Thu Jan  9 2014 Thomas Woerner <twoerner at redhat.com> 1.4.21-2
 - fixed system hang at shutdown if root device is network based (RHBZ#1007934)