[perdition] Drop sysvinit subpackage from F23+
Adam Jackson
ajax at fedoraproject.org
Fri Mar 6 15:17:03 UTC 2015
commit dd86d7efee88d0915dc6edad4d956b738637af29
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Mar 6 10:17:02 2015 -0500
Drop sysvinit subpackage from F23+
perdition.spec | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/perdition.spec b/perdition.spec
index fddc726..ca25f7f 100644
--- a/perdition.spec
+++ b/perdition.spec
@@ -1,7 +1,7 @@
Summary: Mail Retrieval Proxy
Name: perdition
Version: 2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://horms.net/projects/perdition/
@@ -106,6 +106,7 @@ libraries much in the manner of NSS in glibc. This package allows a user
access databases via ODBC.
+%if 0%{?fedora} < 23
%package sysvinit
BuildArch: noarch
Summary: Legacy SysV initscripts for %{name}
@@ -119,6 +120,7 @@ Requires(postun): initscripts
%description sysvinit
Legacy SysV initscripts for init mechanisms such as upstart
which do not support the systemd unit file format.
+%endif
%prep
@@ -150,11 +152,13 @@ mkdir -p %{buildroot}{%{_initrddir},%{_sysconfdir}/sysconfig}
make DESTDIR=%{buildroot} install
+%if 0%{?fedora} < 23
install -m755 ./%{_initrddir}/%{name}.rh %{buildroot}%{_initrddir}/%{name}
install -m644 ./%{_sysconfdir}/sysconfig/%{name} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
# Do not start by default
sed -i '/# Default-Start:/d' %{buildroot}%{_initrddir}/%{name}
+%endif
for service in pop3 pop3s imap4 imap4s managesieve; do
sed "s/{name}/$service/g;s/{NAME}/$(echo $service | tr '[a-z]' '[A-Z]')/g" %{SOURCE1} > %{name}-$service.service
@@ -173,8 +177,10 @@ rm -f %{buildroot}%{_libdir}/*.{a,la,so}
%systemd_post %{name}-imap4s.service
%systemd_post %{name}-managesieve.service
+%if 0%{?fedora} < 23
%post sysvinit
/sbin/chkconfig --add %{name}
+%endif
%postun
/sbin/ldconfig
@@ -191,11 +197,13 @@ rm -f %{buildroot}%{_libdir}/*.{a,la,so}
%systemd_preun %{name}-imap4s.service
%systemd_preun %{name}-managesieve.service
+%if 0%{?fedora} < 23
%preun sysvinit
if [ $1 = 0 ]; then
/sbin/service %{name} stop > /dev/null 2>&1
/sbin/chkconfig --del %{name}
fi
+%endif
%post bdb -p /sbin/ldconfig
%postun bdb -p /sbin/ldconfig
@@ -264,9 +272,11 @@ fi
%{_unitdir}/%{name}-imap4s.service
%{_unitdir}/%{name}-managesieve.service
+%if 0%{?fedora} < 23
%files sysvinit
%{_initrddir}/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%endif
%files bdb
%{_libdir}/lib%{name}db_bdb.so.0
@@ -304,6 +314,9 @@ fi
%{_mandir}/man8/%{name}db_odbc_makedb.*
%changelog
+* Fri Mar 06 2015 Adam Jackson <ajax at redhat.com> 2.1-3
+- Drop sysvinit subpackage from F23+
+
* Fri Oct 24 2014 Pavel Alexeev <Pahan at Hubbitus.info> - 2.1-2
- Rebuild with new vanessa_adt (bz#1152950)
More information about the scm-commits
mailing list