[3proxy] Drop sysvinit subpackage on F23+

Adam Jackson ajax at fedoraproject.org
Thu Mar 5 19:20:08 UTC 2015


commit 4f3a65bfc88c54c0cd216eda38cf363f08afa86d
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 5 14:20:06 2015 -0500

    Drop sysvinit subpackage on F23+

 3proxy.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/3proxy.spec b/3proxy.spec
index 4f3b6a9..88e2937 100644
--- a/3proxy.spec
+++ b/3proxy.spec
@@ -5,7 +5,7 @@
 
 Name:		3proxy
 Version:		0.7.1.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 
 Summary:		Tiny but very powerful proxy
 Summary(ru):	Маленький, но крайне мощный прокси-сервер
@@ -54,6 +54,7 @@ SOCKS v5, FTP, POP3, UDP и TCP проброс портов (portmapping), сп
 на имени пользователя, слиентском IP адресе, IP цели, времени дня, дня недели
 и т.д.
 
+%if 0%{fedora} < 23
 %package sysvinit
 Summary:	Legacy SysV initscripts for %{name} server
 Group:	System Environment/Daemons
@@ -61,6 +62,7 @@ Group:	System Environment/Daemons
 %description sysvinit
 Legacy SysV initscripts for init mechanisms such as upstart
 which do not support the systemd unit file format.
+%endif
 
 %prep
 %setup -q -n %{name}
@@ -93,7 +95,9 @@ install -m755 -D src/socks %{buildroot}%{_bindir}/socks
 install -m755 -D src/tcppm %{buildroot}%{_bindir}/tcppm
 install -m755 -D src/udppm %{buildroot}%{_bindir}/udppm
 
+%if 0%{?fedora} < 23
 install -pD -m755 %{SOURCE1} %{buildroot}/%{_initrddir}/%{name}
+%endif
 install -pD -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.cfg
 install -pD -m755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 
@@ -142,10 +146,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*.3.gz
 %{_unitdir}/%{name}.service
 
+%if 0%{?fedora} < 23
 %files sysvinit
 %{_initrddir}/%{name}
+%endif
 
 %changelog
+* Thu Mar 05 2015 Adam Jackson <ajax at redhat.com> 0.7.1.2-2
+- Drop sysvinit subpackage on F23+
+
 * Mon Feb 23 2015 Pavel Alexeev <Pahan at Hubbitus.info> - 0.7.7.2-1
 - New upstream version 0.7.7.2
 


More information about the scm-commits mailing list