[giis] Remove sysvinit subpackage in F23+

Adam Jackson ajax at fedoraproject.org
Thu Mar 5 20:21:29 UTC 2015


commit 0d9272d5a2332161f65174815405fc0885684ad6
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Mar 5 15:21:26 2015 -0500

    Remove sysvinit subpackage in F23+

 giis.spec | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/giis.spec b/giis.spec
index 5c0bfba..cc4952b 100644
--- a/giis.spec
+++ b/giis.spec
@@ -4,7 +4,7 @@ Summary(ru):	Решение для восстановления удалённы
 Summary(de):	Wiederherstellen gelöschter Dateien "gET iT i sAY"
 # Version 4.7 is another product with GUI by default
 Version:		4.6.2
-Release:		8%{?dist}
+Release:		9%{?dist}
 URL:			http://giis.sf.net/
 Source0:		http://www.giis.co.in/giis/%{name}_%{version}.tar.gz
 # Source1 and Source2 - self written Service-file and wrapper to omit use /etc/inittab to once run on boot stage and then run each 20 minuts
@@ -31,6 +31,7 @@ gET iT i sAY giis is an ext2/ext3 File Undelete Tool.
 "gET iT i sAY" ist ein Werkzeug zum Wiederherstellen gelöschter Dateien auf
 ext2/ext3-Dateisystemen.
 
+%if 0%{?fedora} < 23
 %package sysvinit
 Summary:			Legacy sysvinit scripts for daemon
 Summary(ru):		Устаревшие скрипты инициализации в стиле sysvinit
@@ -48,6 +49,7 @@ May be needed f.e. on CentOS.
 
 %description sysvinit -l de
 Startdateien für z.B. CentOS.
+%endif
 
 %prep
 %setup -q -n %{name}_%{version}
@@ -69,12 +71,14 @@ find \( -iname '*.c' -or -iname '*.h' \) -exec sh -c 'F="{}"; touch --reference
 
 install -d %{buildroot}/%{_bindir}
 install -d %{buildroot}/%{_sysconfdir}
-install -d %{buildroot}/%{_initrddir}/
 install -m 0644 config/%{name}.conf %{buildroot}/%{_sysconfdir}/
 cd src
 make install DESTDIR=%{buildroot}
 install -m 0755 %{SOURCE1} %{buildroot}/%{_bindir}/
+%if 0%{?fedora} < 23
+install -d %{buildroot}/%{_initrddir}/
 install -m 0755 %{SOURCE2} %{buildroot}/%{_initrddir}/%{name}
+%endif
 mkdir -p %{buildroot}/%{_datarootdir}/%{name}
 install -Dp -m 0644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 
@@ -83,28 +87,34 @@ install -Dp -m 0644 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service
 # rmdir needed, because giis check it on install, and if it exists fail installation
 rmdir %{_datarootdir}/%{name} && %{name} -i &>/dev/null
 
+%if 0%{?fedora} < 23
 %post sysvinit
 /sbin/chkconfig --add %{name}
 # rmdir needed, because giis check it on install, and if it exists fail installation
 rmdir %{_datarootdir}/%{name} && %{name} -i &>/dev/null
+%endif
 
 %preun
 %systemd_preun giis.service
 rm -rf %{_datarootdir}/%{name}/*
 
+%if 0%{?fedora} < 23
 %preun sysvinit
 if [ $1 = 0 ]; then
 	/sbin/service %{name} stop > /dev/null 2>&1
 	/sbin/chkconfig --del %{name}
 	rm -rf %{_datarootdir}/%{name}/*
 fi
+%endif
 
 %postun
 %systemd_postun_with_restart giis.service
 
+%if 0%{?fedora} < 23
 # https://fedoraproject.org/wiki/Packaging:SysVInitScript#Initscripts_in_addition_to_systemd_unit_files
 %triggerpostun -n %{name}-sysvinit -- %{name} < 4.6-15
 /sbin/chkconfig --add %{name} >/dev/null 2>&1 || :
+%endif
 
 %files
 %doc ChangeLog AUTHORS COPYING README
@@ -114,10 +124,15 @@ fi
 %{_datarootdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 
+%if 0%{?fedora} < 23
 %files sysvinit
 %{_initrddir}/%{name}
+%endif
 
 %changelog
+* Thu Mar 05 2015 Adam Jackson <ajax at redhat.com> 4.6.2-9
+- Remove sysvinit subpackage in F23+
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -220,4 +235,4 @@ fi
 - Add full section %%files
 - Add install missing directories:
 	install -d $RPM_BUILD_ROOT/%%{_bindir}
-	install -d $RPM_BUILD_ROOT/%%{_sysconfdir}
\ No newline at end of file
+	install -d $RPM_BUILD_ROOT/%%{_sysconfdir}


More information about the scm-commits mailing list