Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2017-03-12 20:05:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ulogd" Sun Mar 12 20:05:36 2017 rev:12 rq:478684 version:2.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2015-05-18 22:28:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2017-03-12 20:05:37.983892001 +0100 @@ -1,0 +2,6 @@ +Sat Mar 11 16:15:30 UTC 2017 - [email protected] + +- Drop init.d script and insserv use. +- Propagate useradd failure and abort install if necessary. + +------------------------------------------------------------------- Old: ---- etc-init.d-ulogd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulogd.spec ++++++ --- /var/tmp/diff_new_pack.CAUAwl/_old 2017-03-12 20:05:38.679793529 +0100 +++ /var/tmp/diff_new_pack.CAUAwl/_new 2017-03-12 20:05:38.683792963 +0100 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -28,7 +28,6 @@ #DL-URL: http://netfilter.org/projects/ulogd/files/ Source: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2 Source2: http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig -Source3: etc-init.d-ulogd Source4: ulogd.service Patch4: ulogd-conf.diff @@ -95,48 +94,32 @@ %build autoreconf -fi %configure --disable-static -make %{?_smp_mflags}; +make %{?_smp_mflags} %install -b="%buildroot"; -make install DESTDIR="$b"; -find "$b" -type f -iname "*.la" -delete; -mkdir -p "$b/var/log/ulogd"; -mkdir -p "$b/%_sysconfdir"; -install -pm0644 ulogd.conf "$b/%_sysconfdir/"; -%if 0%{?_unitdir:1} -mkdir -p "$b/%_unitdir"; -install -pm0644 "%{S:4}" "$b/%_unitdir"; -%else -mkdir -p "$b/%_initrddir" "$b/%_sbindir"; -install -pm0755 "%{S:3}" "$b/%_initrddir/%name"; -ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name"; -%endif +b="%buildroot" +make install DESTDIR="$b" +find "$b" -type f -iname "*.la" -delete +mkdir -p "$b/var/log/ulogd" +mkdir -p "$b/%_sysconfdir" +install -pm0644 ulogd.conf "$b/%_sysconfdir/" +mkdir -p "$b/%_unitdir" +install -pm0644 "%{S:4}" "$b/%_unitdir" +ln -s /sbin/service "$b/%_sbindir/rc%name" %pre /usr/bin/getent passwd ulogd >/dev/null || \ -/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd || : -%if 0%{?_unitdir:1} +/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd %service_add_pre ulogd.service -%endif -%if 0%{?_unitdir:1} %post %service_add_post ulogd.service -%endif -%if 0%{?_unitdir:1} %preun %service_del_preun ulogd.service -%endif %postun -%if 0%{?suse_version} -%insserv_cleanup -%endif -%if 0%{?_unitdir:1} %service_del_postun ulogd.service -%endif %files %defattr(-,root,root) @@ -153,12 +136,8 @@ %_libdir/%name/ulogd_output_XML.so* %_mandir/*/* %attr(0750,ulogd,root) /var/log/ulogd -%if 0%{?_unitdir:1} %_unitdir/ulogd.service -%else -%_initddir/%name %_sbindir/rc%name -%endif # These are the dependency-heavy things:
