move libraries to libiptables subpackage [release 1.8.8-2mamba;Wed Nov 02 2022]

iptables.spec

@@ -1,6 +1,6 @@
 Name:          iptables
 Version:       1.8.8
-Release:       1mamba
+Release:       2mamba
 Summary:       kernel libraries, user tools/libraries for netfilter/iptables firewalling
 Group:         Network/Security
 Vendor:        openmamba
@@ -20,9 +20,10 @@ BuildRequires: libnftnl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libnftnl-devel >= 1.0.9
 Provides:      iptables-nat
-Obsoletes:     iptables-nat
+Obsoletes:     iptables-nat < 1.8.8
 Provides:      ebtables
-Obsoletes:     ebtables
+Obsoletes:     ebtables < 1.8.8
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description
 Iptables is the new firewalling code in the 2.4.x and 2.6.x linux kernels.
@@ -32,6 +33,7 @@ It provides a more extensible architecture for packet matching and manipulation
 Summary:       IPv6 support for iptables
 Group:         Network/Security
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description ipv6
 Iptables is the new firewalling code in the 2.4.x and 2.6.x linux kernels.
@@ -40,26 +42,26 @@ It provides a more extensible architecture for packet matching and manipulation
 Install iptables-ipv6 if you need to set up firewalling for your network and you're using ipv6.
 IPv6 is the next version of the IP protocol.
 
-%package devel
+%package -n lib%{name}
+Summary:       Shared libraries provided with %{name}
+Group:         System/Libraries
+
+%description -n lib%{name}
+Iptables is the new firewalling code in the 2.4.x and 2.6.x linux kernels.
+It provides a more extensible architecture for packet matching and manipulation by moving all but the lowest level into userspace libraries and kernel modules.
+This package contains the shared libraries provided with %{name}.
+
+%package -n lib%{name}-devel
 Summary:       Header files needed for development with xtables
 Group:         Network/Security
-Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-Requires:      %{name}-ipv6 = %{?epoch:%epoch:}%{version}-%{release}
+Provides:      iptables-devel
+Obsoletes:     iptables-devel <= 1.8.8-1mamba
 
-%description devel
+%description -n lib%{name}-devel
 Iptables is the new firewalling code in the 2.4.x and 2.6.x linux kernels.
 It provides a more extensible architecture for packet matching and manipulation by moving all but the lowest level into userspace libraries and kernel modules.
 This package contains the header files needed for development with xtables.
 
-#%package nat
-#Summary:       IPtables script that enables NAT functionality
-#Group:         Network/Security
-#Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
-
-#%description nat
-#This is a simple script that enables iptables NAT functionality from an interface marked as local in /etc/sysconfig/network-devices/ifconfig.*  using 
-#the variable ZONE=local.
-
 %debug_package
 
 %prep
@@ -88,35 +90,14 @@ sed -i "/#define HAVE_LINUX_BPF_H/d" config.h
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
-%post
-# new install
-if [ $1 -ge 1 ]; then
-   /sbin/ldconfig
-#   /sbin/chkconfig --add iptables
-#   service iptables condrestart
-fi
-exit 0
-
-%preun
-#erase
-if [ $1 -eq 0 ]; then
-#   service iptables stop
-   /sbin/chkconfig --del iptables
-fi
-exit 0
+%post -n lib%{name} -p /sbin/ldconfig
+%postun -n lib%{name} -p /sbin/ldconfig
 
 %posttrans
 # clean old sysv broken links
 find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;   
 :
 
-#%post nat
-#if [ $1 -eq 1 ]; then
-#   /usr/sbin/iptables-nat.sh && \
-#      /sbin/iptables-save > %{_sysconfdir}/sysconfig/iptables
-#fi
-#exit 0
-
 %files
 %defattr(-,root,root)
 %{_sysconfdir}/ethertypes
@@ -129,14 +110,6 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %{_sbindir}/iptables
 %{_sbindir}/iptables-*
 %{_sbindir}/nfnl_osf
-%dir %{_libdir}/xtables
-%{_libdir}/xtables/libarpt_*.so
-%{_libdir}/xtables/libebt_*.so
-%{_libdir}/xtables/libxt_*.so
-%{_libdir}/xtables/libipt_*.so
-%{_libdir}/libxtables.so.*
-#%{_libdir}/libiptc.so.*
-%{_libdir}/libip4tc.so.*
 %dir %{_datadir}/xtables
 %{_datadir}/xtables/pf.os
 %{_mandir}/man1/iptables-*.1*
@@ -150,34 +123,40 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
 %files ipv6
 %defattr(-,root,root)
 %{_sbindir}/ip6tables*
-%{_libdir}/libip6tc.so.*
-%{_libdir}/xtables/libip6t_*.so
 %{_mandir}/man8/ip6tables.8*
 %{_mandir}/man8/ip6tables-*.8*
 
-%files devel
+%files -n lib%{name}
 %defattr(-,root,root)
-%{_includedir}/xtables-version.h
+%{_libdir}/libip4tc.so.*
+%{_libdir}/libip6tc.so.*
+%dir %{_libdir}/xtables
+%{_libdir}/xtables/libarpt_*.so
+%{_libdir}/xtables/libebt_*.so
+%{_libdir}/xtables/libxt_*.so
+%{_libdir}/xtables/libip6t_*.so
+%{_libdir}/xtables/libipt_*.so
+%{_libdir}/libxtables.so.*
+%doc COPYING
+
+%files -n lib%{name}-devel
+%defattr(-,root,root)
+%dir %{_includedir}/libiptc
 %{_includedir}/libiptc/*.h
-#%{_libdir}/libiptc.la
-#%{_libdir}/libiptc.so
-%{_libdir}/libip4tc.la
-%{_libdir}/libip4tc.so
-%{_libdir}/libip6tc.la
-%{_libdir}/libip6tc.so
-%{_libdir}/libxtables.la
-%{_libdir}/libxtables.so
 %{_includedir}/xtables.h
+%{_includedir}/xtables-version.h
+%{_libdir}/libip4tc.so
+%{_libdir}/libip6tc.so
+%{_libdir}/libxtables.so
 %{_libdir}/pkgconfig/xtables.pc
 %{_libdir}/pkgconfig/libiptc.pc
 %{_libdir}/pkgconfig/libip4tc.pc
 %{_libdir}/pkgconfig/libip6tc.pc
 
-#%files nat
-#%defattr(-,root,root)
-#%{_sbindir}/iptables-nat.sh
-
 %changelog
+* Wed Nov 02 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.8-2mamba
+- move libraries to libiptables subpackage
+
 * Sat May 14 2022 Automatic Build System <autodist@mambasoft.it> 1.8.8-1mamba
 - automatic version update by autodist