Accepting request 685001 from network

OBS-URL: https://build.opensuse.org/request/show/685001
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pen?expand=0&rev=17

pen.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Mar 14 12:08:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Feed through spec-cleaner. Trim undesirable author list.
+- Drop unused PreReq, and add needed systemd-rpm-macros instead.
+
+-------------------------------------------------------------------
+Tue Mar 12 14:48:32 UTC 2019 - josef.moellers@suse.com
+
+- Added systemd support.
+  [bsc#1116032, pen.service]
+
 -------------------------------------------------------------------
 Tue Feb 10 18:02:56 UTC 2015 - sfalken@opensuse.org
 

pen.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=A simple load balancer for tcp based protocols
+After=time-sync.target nss-lookup.target syslog.socket remote-fs.target
+[Service]
+Type=forking
+ExecStart=/usr/share/pen/scripts/rcpen start
+ExecStop=/usr/share/pen/scripts/rcpen stop
+[Install]
+WantedBy=multi-user.system

pen.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pen
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,27 +12,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           pen
-Summary:        A simple load balancer for tcp based protocols
-License:        GPL-2.0+
-Group:          Productivity/Clustering/HA
-Url:            http://siag.nu/pen/
 Version:        0.26.1
 Release:        0
+Summary:        A simple load balancer for TCP-based protocols
+License:        GPL-2.0-or-later
+Group:          Productivity/Clustering/HA
+URL:            http://siag.nu/pen/
 Source0:        http://siag.nu/pub/pen/%{name}-%{version}.tar.gz
 Source1:        %{name}.cfg
 Source2:        init.%{name}
 Source3:        runpen.sh
-PreReq:         %insserv_prereq %fillup_prereq 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source4:        pen.service
+BuildRequires:  systemd-rpm-macros
+%systemd_requires
 
 %description
-Pen is a load balancer for "simple" tcp based protocols such as http or
-smtp. It allows several servers to appear as one to the outside and
+Pen is a load balancer for "simple" TCP-based protocols such as HTTP or
+SMTP. It allows several servers to appear as one to the outside and
 automatically detects servers that are down and distributes clients
 among the available servers. This gives high availability and scalable
 performance.
@@ -51,13 +52,7 @@ available, even when individual servers are brought down for
 maintenance or reconfiguration.
 
 The final single point of failure, pen itself, can be eliminated by
-running pen on several servers, using vrrp to decide which is active.
-
-
-
-Authors:
---------
-    Ulric Eriksson  <ulric@siag.nu>
+running pen on several servers, using VRRP to decide which is active.
 
 %prep
 %setup -q
@@ -65,46 +60,47 @@ Authors:
 %build
 %configure \
   --with-daemon
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%_sbindir
-#make DESTDIR="$RPM_BUILD_ROOT" install
-%makeinstall
+mkdir -p %{buildroot}/%{_sbindir}
+%make_install
 # Install pen init script
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 0744 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/%{name}
-install -m 0744 %SOURCE3 $RPM_BUILD_ROOT/usr/bin/runpen.sh
-install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/etc/%{name}.cfg
-ln -sf ../../etc/init.d/%{name} $RPM_BUILD_ROOT/usr/sbin/rc%{name}
-mkdir -p ${RPM_BUILD_ROOT}%{_docdir}
-mv $RPM_BUILD_ROOT/usr/doc/pen ${RPM_BUILD_ROOT}%{_docdir}
+install -d %{buildroot}/%{_datadir}/pen/scripts
+install -m 0744 %{SOURCE2} %{buildroot}/%{_datadir}/pen/scripts/rcpen
+install -d %{buildroot}/%{_unitdir}
+install -m 0444 %{SOURCE4} %{buildroot}/%{_unitdir}/pen.service
+install -m 0744 %{SOURCE3} %{buildroot}%{_bindir}/runpen.sh
+install -d %{buildroot}%{_sysconfdir}
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}.cfg
+ln -sf service %{buildroot}%{_sbindir}/rcpen
+mkdir -p %{buildroot}/%{_docdir}
+mv %{buildroot}%{_prefix}/doc/pen %{buildroot}/%{_docdir}
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%pre
+%service_add_pre pen.service
 
 %post
-%{fillup_and_insserv -n pen pen}
-
-%postun
-%restart_on_update %{name}
-%insserv_cleanup
+%service_add_post pen.service
 
 %preun
-%stop_on_removal %{name}
+%service_del_preun pen.service
+
+%postun
+%service_del_postun pen.service
 
 %files
-%defattr(-,root,root)
 %{_docdir}/*
-%{_mandir}/man1/*.1.gz
-/etc/init.d/%{name}
-/usr/bin/%{name}
-/usr/bin/runpen.sh
-/usr/bin/mergelogs
-/usr/bin/penctl
-/usr/bin/penlog
-/usr/bin/penlogd
-/usr/sbin/rc%{name}
-%config(noreplace) /etc/%{name}.cfg
+%{_mandir}/man1/*.1%{?ext_man}
+%{_datadir}/pen
+%{_unitdir}/pen.service
+%{_bindir}/%{name}
+%{_bindir}/runpen.sh
+%{_bindir}/mergelogs
+%{_bindir}/penctl
+%{_bindir}/penlog
+%{_bindir}/penlogd
+%{_sbindir}/rc%{name}
+%config(noreplace) %{_sysconfdir}/%{name}.cfg
 
 %changelog