Hello community, here is the log from the commit of package netatalk for openSUSE:Factory checked in at 2015-01-23 15:46:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netatalk (Old) and /work/SRC/openSUSE:Factory/.netatalk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netatalk" Changes: -------- --- /work/SRC/openSUSE:Factory/netatalk/netatalk.changes 2015-01-14 11:45:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.netatalk.new/netatalk.changes 2015-01-23 15:46:15.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Jan 20 07:20:26 UTC 2015 - mplus...@suse.com + +- Don't install init script on systems with systemd +- Spec file cleanup with spec-cleaner +- Fix systemd specific conditions to match packaging guidelines + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netatalk.spec ++++++ --- /var/tmp/diff_new_pack.tDw88k/_old 2015-01-23 15:46:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tDw88k/_new 2015-01-23 15:46:16.000000000 +0100 @@ -18,17 +18,14 @@ %define with_afpstats 0 %define with_tracker_spotlight 0 - +%define libmaj 16 Name: netatalk -Url: http://netatalk.sourceforge.net/ -Requires: cyrus-sasl -Requires: db-utils Version: 3.1.7 Release: 0 -%define libmaj 16 Summary: AFP Fileserver for Macintosh Clients License: GPL-2.0+ Group: Productivity/Networking/System +Url: http://netatalk.sourceforge.net/ Source: http://downloads.sourceforge.net/project/netatalk/netatalk/%{version}/netatalk-%{version}.tar.bz2 Source1: netatalk-latinize.pl Source3: netatalk-upgrade_netatalk_AppleDB.sh @@ -37,16 +34,8 @@ Patch0: %{name}-wrong-error-message.patch Patch2: netatalk-libc-xattr.patch Patch3: fce-afpd-fix-fce_event_names-array-overflow.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: db-devel -%if 0%{?with_afpstats}%{?with_tracker_spotlight} -BuildRequires: dbus-1-devel -BuildRequires: dbus-1-glib-devel -%if 0%{?with_tracker_spotlight} -BuildRequires: tracker-devel -%endif -%endif BuildRequires: automake +BuildRequires: db-devel BuildRequires: fdupes BuildRequires: krb5-devel BuildRequires: libacl-devel @@ -61,23 +50,28 @@ BuildRequires: pkg-config BuildRequires: tcpd-devel BuildRequires: zlib-devel -%if 0%{?suse_version} > 1140 +Requires: cyrus-sasl +Requires: db-utils +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %insserv_prereq %fillup_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?with_afpstats}%{?with_tracker_spotlight} +BuildRequires: dbus-1-devel +BuildRequires: dbus-1-glib-devel +%if 0%{?with_tracker_spotlight} +BuildRequires: tracker-devel +%endif +%endif +%if 0%{?suse_version} > 1210 BuildRequires: systemd -##Requires: %{?systemd_requires} +%{?systemd_requires} %endif -PreReq: %insserv_prereq %fillup_prereq %description Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD system running Netatalk is capable of serving many Macintosh clients simultaneously as an AppleShare file server (AFP). -Authors: --------- - Wesley Craig <netat...@umich.edu> - Ann Arbor <netat...@umich.edu> - and the netatalk team at sourceforge.net - %package -n libatalk%{libmaj} Summary: Netatalk AFP Fileserver for Macintosh Clients Group: Development/Libraries/C and C++ @@ -87,12 +81,6 @@ system running Netatalk is capable of serving many Macintosh clients simultaneously as an AppleShare file server (AFP). -Authors: --------- - Wesley Craig <netatalk-de...@umich.edu> - Ann Arbor <netatalk-de...@umich.edu> - and the netatalk team at sourceforge.net - %package devel Summary: Netatalk AFP Fileserver for Macintosh Clients Group: Development/Libraries/C and C++ @@ -104,12 +92,6 @@ system running Netatalk is capable of serving many Macintosh clients simultaneously as an AppleShare file server (AFP). -Authors: --------- - Wesley Craig <netatalk-de...@umich.edu> - Ann Arbor <netatalk-de...@umich.edu> - and the netatalk team at sourceforge.net - %prep %setup -q -n netatalk-%{version} %patch0 @@ -120,11 +102,11 @@ %build autoreconf -fiv LDFLAGS="-lpthread" \ -CFLAGS="$RPM_OPT_FLAGS -Wall -g -pie -fpie" \ +CFLAGS="%{optflags} -Wall -g -pie -fpie" \ %if 0%{?with_tracker_spotlight} tracker_ver=$(rpm -q --queryformat="%{VERSION}" tracker-devel|cut -d . -f 1-2) %endif -%configure --bindir=/usr/bin \ +%configure --bindir=%{_bindir} \ --disable-static \ --with-pic \ --with-shadow \ @@ -138,8 +120,8 @@ --with-libevent=no \ --with-tdb=no \ --libexecdir=%{_libdir}/netatalk \ - --localstatedir=/var/lib \ - --with-pkgconfdir=/etc/netatalk \ + --localstatedir=%{_localstatedir}/lib \ + --with-pkgconfdir=%{_sysconfdir}/netatalk \ %if %{with_afpstats} == 1 --with-afpstats \ %endif @@ -153,53 +135,60 @@ sed -i '/\/var\/lock\/subsys/d' distrib/initscripts/rc.suse %install -make install DESTDIR="%buildroot" +make DESTDIR=%{buildroot} install %{?_smp_mflags} +%if 0%{?suse_version} > 1140 +ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +%else mkdir -p %{buildroot}%{_sysconfdir}/init.d/ install -m 755 distrib/initscripts/rc.suse %{buildroot}%{_sysconfdir}/init.d/netatalk -ln -sf ../../etc/init.d/netatalk %{buildroot}%{_sbindir}/rcnetatalk +ln -sf ../..%{_initddir}/netatalk %{buildroot}%{_sbindir}/rc%{name} +%endif install -m 755 %{SOURCE3} %{buildroot}%{_sbindir}/upgrade_netatalk_AppleDB.sh # # Conflicts with yudit rm %{buildroot}%{_mandir}/man1/uniconv.1* # -find %{buildroot} -type f -name "*.la" | xargs rm -vf +find %{buildroot} -type f -name "*.la" -delete -print %fdupes -s %{buildroot}%{_mandir} %pre test -f etc/atalk/afpd.conf && { echo -echo "netatalk config files have been moved to /etc/afp.conf" -echo "a backup can be found in /etc/atalk" +echo "netatalk config files have been moved to %{_sysconfdir}/afp.conf" +echo "a backup can be found in %{_sysconfdir}/atalk" echo "please compare them before restarting the netatalk server" } test -f etc/netatalk/afpd.conf && { echo -echo "netatalk config files have been moved to /etc/afp.conf" -echo "a backup can be found in /etc/netatalk" +echo "netatalk config files have been moved to %{_sysconfdir}/afp.conf" +echo "a backup can be found in %{_sysconfdir}/netatalk" echo "please compare them before restarting the netatalk server" } -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} > 1210 %service_add_pre netatalk.service %endif exit 0 %preun %stop_on_removal netatalk -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} > 1210 %service_del_preun netatalk.service %endif %post -%{fillup_and_insserv netatalk} %restart_on_update netatalk -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} > 1210 %service_add_post netatalk.service +%{fillup_only netatalk} +%else +%{fillup_and_insserv netatalk} %endif %postun -%insserv_cleanup -%if 0%{?suse_version} > 1140 +%if 0%{?suse_version} > 1210 %service_del_postun netatalk.service +%else +%insserv_cleanup %endif %post -n libatalk%{libmaj} -p /sbin/ldconfig @@ -225,9 +214,12 @@ %dir %{_sysconfdir}/pam.d %config %{_sysconfdir}/pam.d/* # +%if 0%{?suse_version} > 1210 +%{_libexecdir}/systemd/system/netatalk.service +%else %attr(755,root,root) %{_sysconfdir}/init.d/netatalk -%{_prefix}/lib/systemd/system/netatalk.service -/var/lib/%{name} +%endif +%{_localstatedir}/lib/%{name} %files -n libatalk%{libmaj} %defattr (-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
