[shellinabox/el5: 2/3] FTBFS rawhide, remove f17

[Simone Caronni]

commit d6efb600e123c810c8199f0314d5a02b38670cf1
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Aug 6 09:02:34 2013 +0200

    FTBFS rawhide, remove f17

 shellinabox.spec |   60 ++++++++++++++---------------------------------------
 1 files changed, 16 insertions(+), 44 deletions(-)
---
diff --git a/shellinabox.spec b/shellinabox.spec
index f143ce8..a91a7de 100644
--- a/shellinabox.spec
+++ b/shellinabox.spec
@@ -22,29 +22,22 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 Requires:       openssl
+Requires(pre):  shadow-utils
 
-%if 0%{?fedora} == 17
-Requires(post):         systemd-units
-Requires(preun):        systemd-units
-Requires(postun):       systemd-units
-%endif
-
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-Requires(post):         systemd-sysv
-Requires(post):         systemd
-Requires(preun):        systemd
-Requires(postun):       systemd
+%if 0%{?fedora} || 0%{?rhel} >= 7
+BuildRequires:      systemd
+Requires(post):     systemd
+Requires(preun):    systemd
+Requires(postun):   systemd
 %endif
 
 %if 0%{?rhel} == 5 || 0%{?rhel} == 6
-Requires(post):         /sbin/chkconfig
-Requires(preun):        /sbin/chkconfig
-Requires(preun):        /sbin/service
-Requires(postun):       /sbin/service
+Requires(post):     /sbin/chkconfig
+Requires(preun):    /sbin/chkconfig
+Requires(preun):    /sbin/service
+Requires(postun):   /sbin/service
 %endif
 
-Requires(pre):          shadow-utils
-
 %description
 Shell In A Box implements a web server that can export arbitrary command line
 tools to a web based terminal emulator. This emulator is accessible to any
@@ -94,31 +87,7 @@ getent passwd %username >/dev/null || useradd -r -s /sbin/nologin \
     -d %{_sharedstatedir}/shellinabox -M -c 'Shellinabox' -g %username %username &>/dev/null || :
 exit 0
 
-%if 0%{?fedora} == 17
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable shellinaboxd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop shellinaboxd.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart shellinaboxd.service >/dev/null 2>&1 || :
-fi
-
-%endif
-
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?rhel} >= 7
 
 %post
 %systemd_post shellinaboxd.service
@@ -149,7 +118,6 @@ fi
 
 %endif
 
-
 %files
 %doc AUTHORS NEWS README README.Fedora GPL-2 COPYING
 %doc shellinabox/styles.css shellinabox/print-styles.css
@@ -165,8 +133,12 @@ fi
 %endif
 %attr(750,%{username},%{username}) %{_sharedstatedir}/%{name}
 
-
 %changelog
+* Tue Aug 06 2013 Simone Caronni <negativo17 at gmail.com> - 2.14-25.git88822c1
+- Add systemd to BuildRequires; not default on Fedora 20+.
+- Remove Fedora 17 conditionals, distribution EOL.
+- Remove systemd-sysv dependency as per new packaging guidelines.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.14-25.git88822c1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild