Hello community, here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2013-03-28 13:09:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/arpwatch (Old) and /work/SRC/openSUSE:Factory/.arpwatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2012-07-18 11:45:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2013-03-28 13:09:54.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 14 11:33:23 UTC 2013 - [email protected] + +- Drop sysvinit support and add systemd support for opensuse > 11.4 + +------------------------------------------------------------------- New: ---- arpwatch.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ arpwatch.spec ++++++ --- /var/tmp/diff_new_pack.H21oTp/_old 2013-03-28 13:09:59.000000000 +0100 +++ /var/tmp/diff_new_pack.H21oTp/_new 2013-03-28 13:09:59.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package arpwatch # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,35 @@ # +%if 0%{?suse_version} > 1140 +%define has_systemd 1 +%endif + Name: arpwatch BuildRequires: libpcap-devel BuildRequires: postfix +%if 0%{?has_systemd} +BuildRequires: systemd +%{?systemd_requires} +%endif Url: http://www-nrg.ee.lbl.gov/nrg.html Requires: arpwatch-ethercodes +%if 0%{?suse_version} <= 1140 PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq +%else +PreReq: /usr/bin/touch %fillup_prereq +%endif Summary: Arpwatch Keeps Track of Ethernet and IP Address Pairings License: BSD-3-Clause Group: Productivity/Networking/Diagnostic Version: 2.1a15 Release: 0 Source: %{name}-%{version}.tar.bz2 +%if 0%{?has_systemd} +Source10: arpwatch.service +%else Source10: arpwatch.init +%endif Source11: sysconfig.arpwatch Patch0: arpwatch-2.1a11-chrootbuild.diff Patch1: arpwatch-no-source-zero.dif @@ -68,7 +84,11 @@ %install mkdir -p \ +%if 0%{?has_systemd} + $RPM_BUILD_ROOT/%{_unitdir} \ +%else $RPM_BUILD_ROOT/etc/init.d \ +%endif $RPM_BUILD_ROOT/%{_sbindir} \ $RPM_BUILD_ROOT/%{_datadir}/arpwatch \ $RPM_BUILD_ROOT/%{_mandir}/man8 \ @@ -80,39 +100,60 @@ cp -p ${file} $RPM_BUILD_ROOT/%{_datadir}/arpwatch done make DESTDIR=$RPM_BUILD_ROOT install-man +%if 0%{?has_systemd} +install -m 0754 $RPM_SOURCE_DIR/arpwatch.service $RPM_BUILD_ROOT/%{_unitdir} +%else install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch +%endif cp -p ${RPM_SOURCE_DIR}/sysconfig.arpwatch $RPM_BUILD_ROOT/var/adm/fillup-templates # own the database files touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat- %preun +%if 0%{?has_systemd} +%service_del_preun arpwatch.service +%else %stop_on_removal arpwatch +%endif %post +%if 0%{?has_systemd} +%service_add_post arpwatch.service +%fillup_only +%else %fillup_and_insserv +%endif if [ ! -f var/lib/arpwatch/arp.dat ]; then touch var/lib/arpwatch/arp.dat fi %postun +%if 0%{?has_systemd} +%service_del_postun arpwatch.service +%else %restart_on_update arpwatch %insserv_cleanup +%endif %files %defattr(-,root,root) +%if 0%{?has_systemd} +%{_unitdir}/arpwatch.service +%else %config /etc/init.d/arpwatch +%{_sbindir}/rcarpwatch +%endif %{_sbindir}/arpsnmp %{_sbindir}/arpwatch -%{_sbindir}/rcarpwatch %dir /var/lib/arpwatch %ghost %config(noreplace) /var/lib/arpwatch/arp.dat %ghost %config(noreplace) /var/lib/arpwatch/arp.dat- /var/adm/fillup-templates/sysconfig.arpwatch %doc %{_mandir}/man8/arpsnmp.8.gz %doc %{_mandir}/man8/arpwatch.8.gz -%doc CHANGES FILES INSTALL README +%doc CHANGES FILES README %files ethercodes-build %defattr(-,root,root) ++++++ arpwatch.service ++++++ [Unit] Description=Arpwatch daemon which keeps track of ethernet/ip address pairings After=syslog.target network.target [Service] Type=forking EnvironmentFile=-/etc/sysconfig/arpwatch/sysconfig.arpwatch PrivateTmp=yes ExecStart=/usr/sbin/arpwatch $OPTIONS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
