Accepting request 280857 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/280857
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-rpm-macros?expand=0&rev=10

macros.systemd

@@ -35,6 +35,7 @@ Requires(postun): systemd								\
 %_udevrulesdir /usr/lib/udev/rules.d
 %_journalcatalogdir /usr/lib/systemd/catalog
 %_tmpfilesdir /usr/lib/tmpfiles.d
+%_sysusersdir /usr/lib/sysusers.d
 %_sysctldir /usr/lib/sysctl.d
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
@@ -151,6 +152,9 @@ fi											\
 /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :					\
 %{nil}
 
+%systemd_user_postun() %{nil}
+%systemd_user_postun_with_restart() %{nil}
+
 %systemd_postun_with_restart()								\
 @rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || :				\
 if [ $1 -ge 1 ] ; then									\
@@ -175,6 +179,14 @@ fi											\
 /usr/bin/systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
 %{nil}
 
+%sysusers_create() \
+systemd-sysusers %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%sysusers_create_inline() \
+echo %{?*} | systemd-sysusers - >/dev/null 2>&1 || : \
+%{nil}
+
 %sysctl_apply() \
 /usr/lib/systemd/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
 %{nil}

systemd-rpm-macros.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  9 13:38:16 UTC 2015 - jengelh@inai.de
+
+- Update with new macros from systemd 218
+- Remove empty sections from specfile
+
 -------------------------------------------------------------------
 Tue Nov 18 15:16:13 UTC 2014 - werner@suse.de
 

systemd-rpm-macros.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,8 +16,6 @@
 #
 
 
-#!BuildIgnore: util-linux
-
 Name:           systemd-rpm-macros
 Version:        2
 Release:        0
@@ -29,13 +27,13 @@ Source0:        macros.systemd
 Requires:       coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+#!BuildIgnore:  util-linux
 
 %description
 Starting with openSUSE 12.1, several RPM macros must be used to package systemd
 services files. This package provides these macros.
 
 %prep
-cd %{_sourcedir}
 
 %build
 
@@ -48,10 +46,6 @@ for i in $UNITDIR `dirname $UNITDIR`; do
    echo $i >> unitdir
 done
 
-%post
-
-%postun
-
 %files -f unitdir
 %defattr(-,root,root)
 %config %{_sysconfdir}/rpm/macros.systemd