Hello community,
here is the log from the commit of package systemd-rpm-macros for
openSUSE:Factory checked in at 2014-12-01 14:00:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-rpm-macros"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2014-10-19 19:27:25.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes
2014-12-01 14:00:32.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Nov 18 15:16:13 UTC 2014 - [email protected]
+
+- Mark /etc/rpm/macros.systemd as configuration file
+
+-------------------------------------------------------------------
+Tue Nov 18 13:30:37 UTC 2014 - [email protected]
+
+- Apply then delete patch systemd-daemon-reload-before-service-restart.patch
+- Add orignal systemd macros as well (boo#807164)
+
+-------------------------------------------------------------------
Old:
----
systemd-daemon-reload-before-service-restart.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.KOfrZU/_old 2014-12-01 14:00:33.000000000 +0100
+++ /var/tmp/diff_new_pack.KOfrZU/_new 2014-12-01 14:00:33.000000000 +0100
@@ -29,8 +29,6 @@
Requires: coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-# make systemd aware of changed unit file content after update
-Patch0: systemd-daemon-reload-before-service-restart.patch
%description
Starting with openSUSE 12.1, several RPM macros must be used to package systemd
@@ -38,7 +36,6 @@
%prep
cd %{_sourcedir}
-%patch0 -p1
%build
@@ -57,6 +54,6 @@
%files -f unitdir
%defattr(-,root,root)
-%{_sysconfdir}/rpm/macros.systemd
+%config %{_sysconfdir}/rpm/macros.systemd
%changelog
++++++ macros.systemd ++++++
--- /var/tmp/diff_new_pack.KOfrZU/_old 2014-12-01 14:00:33.000000000 +0100
+++ /var/tmp/diff_new_pack.KOfrZU/_new 2014-12-01 14:00:33.000000000 +0100
@@ -29,6 +29,7 @@
Requires(postun): systemd
\
%_unitdir /usr/lib/systemd/system
+%_userunitdir /usr/lib/systemd/user
%_presetdir /usr/lib/systemd/system-preset
%_udevhwdbdir /usr/lib/udev/hwdb.d
%_udevrulesdir /usr/lib/udev/rules.d
@@ -36,6 +37,7 @@
%_tmpfilesdir /usr/lib/tmpfiles.d
%_sysctldir /usr/lib/sysctl.d
%_ntpunitsdir /usr/lib/systemd/ntp-units.d
+%_binfmtdir /usr/lib/binfmt.d
%service_add_pre()
\
test -n "$FIRST_ARG" || FIRST_ARG=$1
\
@@ -57,7 +59,7 @@
for service in %{?*} ; do
\
sysv_service=${service%.*}
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then
\
- services_to_migrate="$services_to_migrate $sysv_service"
\
+ services_to_migrate="$services_to_migrate $sysv_service"
\
fi
\
done
\
if [ -n "$services_to_migrate" ]; then
\
@@ -97,7 +99,7 @@
test -n "$FIRST_ARG" || FIRST_ARG=$1
\
if [ $FIRST_ARG -eq 0 ]; then
\
# Package removal, not upgrade
\
- /usr/bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || :
\
+ /usr/bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || :
\
/usr/bin/systemctl stop %{?*} > /dev/null 2>&1 || :
\
fi
\
%{nil}
@@ -108,8 +110,9 @@
if [ $FIRST_ARG -ge 1 ]; then
\
# Package upgrade, not uninstall
\
if test "$YAST_IS_RUNNING" != "instsys" -a "$DISABLE_RESTART_ON_UPDATE" !=
yes ; then \
- /usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || :
\
- fi \
+ /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
\
+ /usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || :
\
+ fi
\
else # package uninstall
\
for service in %{?*} ; do
\
sysv_service=${service%.*}
\
@@ -119,6 +122,43 @@
fi
\
%{nil}
+%systemd_post()
\
+if [ $1 -eq 0 ] ; then
\
+ # Package removal, not upgrade
\
+ /usr/bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || :
\
+ /usr/bin/systemctl stop %{?*} > /dev/null 2>&1 || :
\
+fi
\
+%{nil}
+
+%systemd_user_post() %systemd_post --user --global %{?*}
+
+%systemd_preun()
\
+if [ $1 -eq 0 ] ; then
\
+ # Package removal, not upgrade
\
+ /usr/bin/systemctl --no-reload disable %{?*} > /dev/null 2>&1 || :
\
+ /usr/bin/systemctl stop %{?*} > /dev/null 2>&1 || :
\
+fi
\
+%{nil}
+
+%systemd_user_preun()
\
+if [ $1 -eq 0 ] ; then
\
+ # Package removal, not upgrade
\
+ systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1
|| : \
+fi
\
+%{nil}
+
+%systemd_postun()
\
+/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
\
+%{nil}
+
+%systemd_postun_with_restart()
\
+@rootbindir@/systemctl daemon-reload >/dev/null 2>&1 || :
\
+if [ $1 -ge 1 ] ; then
\
+ # Package upgrade, not uninstall
\
+ /usr/bin/systemctl try-restart %{?*} >/dev/null 2>&1 || :
\
+fi
\
+%{nil}
+
%udev_hwdb_update() \
/usr/bin/udevadm hwdb --update >/dev/null 2>&1 || : \
%{nil}
@@ -130,3 +170,16 @@
%journal_catalog_update() \
/usr/bin/journalctl --update-catalog >/dev/null 2>&1 || : \
%{nil}
+
+%tmpfiles_create() \
+/usr/bin/systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%sysctl_apply() \
+/usr/lib/systemd/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
+%binfmt_apply() \
+/usr/lib/systemd/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
+%{nil}
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
