Hello community, here is the log from the commit of package netatalk for openSUSE:12.3 checked in at 2013-02-26 15:22:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/netatalk (Old) and /work/SRC/openSUSE:12.3/.netatalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netatalk", Maintainer is "PGajdos@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/netatalk/netatalk.changes 2013-01-31 01:28:09.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.netatalk.new/netatalk.changes 2013-02-26 15:22:37.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Feb 25 08:48:30 UTC 2013 - mlin@suse.com + +- Install netatalk.service accordingly (/usr/lib/systemd for 12.3 + and up or /lib/systemd for older versions). + * Added netatalk-suse-servicedir-update.diff + +------------------------------------------------------------------- New: ---- netatalk-suse-servicedir-update.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netatalk.spec ++++++ --- /var/tmp/diff_new_pack.kPa8W6/_old 2013-02-26 15:22:38.000000000 +0100 +++ /var/tmp/diff_new_pack.kPa8W6/_new 2013-02-26 15:22:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package netatalk # -# 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 @@ -63,6 +63,13 @@ Source4: netatalk-rpmlintrc Source6: netatalk-upgrade_netatalk_AppleDB.sh Patch1: netatalk.papd.ppdfile.patch +Patch2: netatalk-suse-servicedir-update.diff + +%if %suse_version > 1220 +%define _unitdir /usr/lib/systemd +%else +%define _unitdir /lib/systemd +%endif %description Netatalk is a freely-available Open Source AFP fileserver. It also @@ -105,6 +112,9 @@ %prep %setup -q -n netatalk-%{version} %patch1 -p1 +%if 0%{?suse_version} > 1220 +%patch2 -p1 +%endif cp -avL %{SOURCE1} . cat >> config/AppleVolumes.default.tmpl <<EOF # @@ -225,7 +235,7 @@ %config %{_sysconfdir}/pam.d/* # %attr(755,root,root) %{_sysconfdir}/init.d/netatalk -/lib/systemd/system/netatalk.service +%{_unitdir}/system/netatalk.service %attr(755,root,root) %{_bindir}/* %attr(755,root,lp) %{_sbindir}/papd ++++++ netatalk-suse-servicedir-update.diff ++++++ Index: netatalk-2.2.4/distrib/initscripts/Makefile.am =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.am +++ netatalk-2.2.4/distrib/initscripts/Makefile.am @@ -88,7 +88,7 @@ if USE_SYSTEMD sysvdir = $(pkglibexecdir) sysv_SCRIPTS = netatalk.sh -servicedir = /lib/systemd/system +servicedir = /usr/lib/systemd/system service_DATA = netatalk.service $(sysv_SCRIPTS): rc.atalk.systemd Index: netatalk-2.2.4/distrib/initscripts/Makefile.in =================================================================== --- netatalk-2.2.4.orig/distrib/initscripts/Makefile.in +++ netatalk-2.2.4/distrib/initscripts/Makefile.in @@ -398,7 +398,7 @@ EXTRA_DIST = $(TEMPLATES) @USE_SUSE_SYSV_TRUE@sysv_SCRIPTS = netatalk @USE_SYSTEMD_TRUE@sysv_SCRIPTS = netatalk.sh @USE_TRU64_TRUE@sysv_SCRIPTS = netatalk -@USE_SYSTEMD_TRUE@servicedir = /lib/systemd/system +@USE_SYSTEMD_TRUE@servicedir = /usr/lib/systemd/system @USE_SYSTEMD_TRUE@service_DATA = netatalk.service all: all-am -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org