Reorder the subpackages

This commit is contained in:
Mathieu Bridon 2013-08-30 13:54:05 +08:00
parent 0fc73fbd64
commit 9faae09f7c

View File

@ -14,20 +14,6 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# This is developed hand in hand with a kernel module # This is developed hand in hand with a kernel module
Requires: kernel Requires: kernel
%package service
Summary: %{name} service for %{name}s
Requires: %{name} = %{version}-%{release}
BuildRequires: systemd
Requires: iptables-services
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
BuildArch: noarch
%description service
This package provides the service %{name} that is split
out of the base package since it is not active by default.
%description %description
IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which can be IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel, which can be
administered by the ipset utility. Depending on the type, currently an IP set administered by the ipset utility. Depending on the type, currently an IP set
@ -44,12 +30,14 @@ If you want to:
rule and benefit from the speed of IP sets rule and benefit from the speed of IP sets
then ipset may be the proper tool for you. then ipset may be the proper tool for you.
%package libs %package libs
Summary: Shared library providing the IP sets functionality Summary: Shared library providing the IP sets functionality
%description libs %description libs
This package contains the libraries which provide the IP sets funcionality. This package contains the libraries which provide the IP sets funcionality.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} == %{version}-%{release} Requires: %{name}-libs%{?_isa} == %{version}-%{release}
@ -60,6 +48,21 @@ This package contains the files required to develop software using the %{name}
libraries. libraries.
%package service
Summary: %{name} service for %{name}s
Requires: %{name} = %{version}-%{release}
BuildRequires: systemd
Requires: iptables-services
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
BuildArch: noarch
%description service
This package provides the service %{name} that is split
out of the base package since it is not active by default.
%prep %prep
%setup -q %setup -q
@ -92,12 +95,19 @@ install -c -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/%{name}
# Create directory for configuration # Create directory for configuration
mkdir -p %{buildroot}%{_sysconfdir}/%{name} mkdir -p %{buildroot}%{_sysconfdir}/%{name}
%preun %preun
if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
rmmod xt_set 2>/dev/null rmmod xt_set 2>/dev/null
[[ $? -ne 0 ]] && echo Current iptables configuration requires ipsets && exit 1 [[ $? -ne 0 ]] && echo Current iptables configuration requires ipsets && exit 1
fi fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%post service %post service
%systemd_post %{name}.service %systemd_post %{name}.service
@ -111,10 +121,6 @@ fi
%postun service %postun service
%systemd_postun_with_restart %{name}.service %systemd_postun_with_restart %{name}.service
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files %files
%doc COPYING ChangeLog %doc COPYING ChangeLog
@ -125,16 +131,16 @@ fi
%doc COPYING %doc COPYING
%{_libdir}/lib%{name}.so.3* %{_libdir}/lib%{name}.so.3*
%files devel
%{_includedir}/lib%{name}
%{_libdir}/lib%{name}.so
%files service %files service
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%attr(0755,root,root) %{_libexecdir}/%{name}/%{name}.start-stop %attr(0755,root,root) %{_libexecdir}/%{name}/%{name}.start-stop
%dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}
%files devel
%{_includedir}/lib%{name}
%{_libdir}/lib%{name}.so
%changelog %changelog
* Tue Aug 27 2013 Quentin Armitage <quentin@armitage.org.uk> 6.19-2 * Tue Aug 27 2013 Quentin Armitage <quentin@armitage.org.uk> 6.19-2