subject:"commit systemd\-rpm\-macros for openSUSE\:Factory"

commit systemd-rpm-macros for openSUSE:Factory

2020-10-08 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2020-10-08 13:07:31

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.4249 (New)


Package is "systemd-rpm-macros"

Thu Oct  8 13:07:31 2020 rev:30 rq:839132 version:4.1

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2020-08-31 17:14:48.969040021 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.4249/systemd-rpm-macros.changes
  2020-10-08 13:08:43.594984610 +0200
@@ -1,0 +2,5 @@
+Fri Sep 25 09:25:44 UTC 2020 - Franck Bui 
+
+- Bump version to 4.1
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.7NNLXq/_old  2020-10-08 13:08:45.726986540 +0200
+++ /var/tmp/diff_new_pack.7NNLXq/_new  2020-10-08 13:08:45.730986544 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,12 +17,12 @@
 
 
 Name:   systemd-rpm-macros
-Version:4
+Version:4.1
 Release:0
 Summary:RPM macros for systemd
 License:LGPL-2.1-or-later
 Group:  Development/Tools/Building
-Url:http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
+URL:http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
 Source0:macros.systemd
 Requires:   coreutils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

commit systemd-rpm-macros for openSUSE:Factory

2020-08-31 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2020-08-31 17:14:46

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.3399 (New)


Package is "systemd-rpm-macros"

Mon Aug 31 17:14:46 2020 rev:29 rq:829086 version:4

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2019-03-14 22:42:18.794641678 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.3399/systemd-rpm-macros.changes
  2020-08-31 17:14:48.969040021 +0200
@@ -1,0 +2,8 @@
+Tue Aug 25 00:48:04 UTC 2020 - Neal Gompa 
+
+- Sync missing macros of directory paths from upstream systemd macros
+  + %_environmentdir
+  + %_modulesloaddir
+  + %_modprobedir
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.R33Toy/_old  2020-08-31 17:14:49.593040339 +0200
+++ /var/tmp/diff_new_pack.R33Toy/_new  2020-08-31 17:14:49.593040339 +0200
@@ -33,6 +33,9 @@
 %_sysctldir /usr/lib/sysctl.d
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
+%_environmentdir /usr/lib/environment.d
+%_modulesloaddir /usr/lib/modules-load.d
+%_modprobedir /usr/lib/modprobe.d
 %_systemdgeneratordir /usr/lib/systemd/system-generators
 %_systemdusergeneratordir /usr/lib/systemd/user-generators
 %_systemd_system_env_generator_dir 
/usr/lib/systemd/system-environment-generators

commit systemd-rpm-macros for openSUSE:Factory

2019-03-14 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2019-03-14 22:42:15

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.28833 (New)


Package is "systemd-rpm-macros"

Thu Mar 14 22:42:15 2019 rev:28 rq:684199 version:4

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2019-03-04 09:08:35.184725895 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.28833/systemd-rpm-macros.changes
 2019-03-14 22:42:18.794641678 +0100
@@ -1,0 +2,24 @@
+Tue Mar 12 08:17:25 UTC 2019 - Franck Bui 
+
+- $1 can never be empty or it's an rpm bug
+
+---
+Tue Mar 12 08:03:45 UTC 2019 - Franck Bui 
+
+- Get rid of $FIRST_ARG
+
+  $FIRST_ARG was probably introduced because the %service_* macros
+  were playing tricks on the shell positional parameters. This is bad
+  practice and error prone so let's assume that no macros should do
+  that anymore and hence it's safe to assume that positional
+  parameters remains unchanged after any rpm macro call.
+
+  All users of $FIRST_ARG should have been fixed by now and in most
+  cases the use of the variable was unneeded (since the macros don't
+  change the shell parameters) and thus confusing.
+
+  'net-snmp' has a different use of FIRST_ARG though as it tried to
+  fake an update during a package installation. Fortunately this could
+  have been fixed too.
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.DDvPij/_old  2019-03-14 22:42:19.466641445 +0100
+++ /var/tmp/diff_new_pack.DDvPij/_new  2019-03-14 22:42:19.466641445 +0100
@@ -72,10 +72,9 @@
 %{nil}
 
 %service_add_pre() 
\
-test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
 # disable migration if initial install under systemd   
\
 [ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
-if [ "$FIRST_ARG" -eq 1 ]; then
\
+if [ $1 -eq 1 ]; then  \
for service in %{?*} ; do   
\
sysv_service="${service%%.*}"   
\
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
@@ -105,18 +104,17 @@
 
 # On install, tell systemd to reload its unit files
 %service_add_post()
\
-test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
 [ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\

\
 if [ -x /usr/bin/systemctl ]; then 
\
 /usr/bin/systemctl daemon-reload || :  
\
 fi 
\

\
-if [ "$FIRST_ARG" -eq 1 ]; then
\
+if [ $1 -eq 1 ]; then  
\
if [ -x /usr/bin/systemctl ]; then  
\
/usr/bin/systemctl preset %{?*} || :
\
fi  
\
-elif [ "$FIRST_ARG" -gt 1 ]; then  
\
+elif [ $1 -gt 1 ]; then
\
for service in %{?*} ; do   
\
if [ ! -e "/run/rpm-%{name}-update-$service-new-in-upgrade" ]; 
then \
continue
\
@@ -150,8 +148,7 @@
 # variable if not found use the value read from /etc/sysconfig/services
 #
 %service_del_preun(fn) 
\
-test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
-if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then   
\
+if [ $1 -eq 0 -a -x

commit systemd-rpm-macros for openSUSE:Factory

2019-03-04 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2019-03-04 09:08:29

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.28833 (New)


Package is "systemd-rpm-macros"

Mon Mar  4 09:08:29 2019 rev:27 rq:680402 version:4

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-12-10 12:22:18.546887932 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.28833/systemd-rpm-macros.changes
 2019-03-04 09:08:35.184725895 +0100
@@ -1,0 +2,71 @@
+Fri Mar  1 08:18:07 UTC 2019 - Franck Bui 
+
+- Fix %_restart_on_update_force: drop one extra trailing '}'
+
+  Thanks Werner for spotting.
+
+---
+Wed Feb 27 17:43:13 UTC 2019 - Franck Bui 
+
+- Simplify %_restart_on_update and %_stop_on_removal
+
+  There's no need to spawn sub shells when these macros are used.
+
+---
+Wed Feb 27 16:57:04 UTC 2019 - Franck Bui 
+
+- Macros arguments are mandatory
+
+  Especially in %_restart_on_update_never and %_stop_on_removal_never,
+  let's assume that they always receive unit names as arguments. This
+  allows to make them slightly simpler (less rpm macro black magic).
+
+  Callers will fail earlier if no arguments are passed anyway.
+
+---
+Wed Feb 27 14:13:28 UTC 2019 - Franck Bui 
+
+- Make sure %_restart_on_update_never and %_stop_on_removal_never
+  don't expand to the empty string
+
+  Otherwise sequences like the following would result in incorrect
+  shell syntax:
+
+  if [ ]; then
+ %_restart_on_update_never
+  fi
+
+---
+Wed Feb 27 12:17:18 UTC 2019 - Franck Bui 
+
+- Restore one daemon-reload command
+
+  It was erroneously removed during the drop of $YAST_IS_RUNNING.
+
+---
+Mon Feb 25 09:55:28 UTC 2019 - Franck Bui 
+
+- Bump version to 4
+
+---
+Thu Feb 22 13:00:18 UTC 2019 - Franck Bui 
+
+- Introduce %service_del_postun_without_restart
+
+  This is another step to make the SUSE rpm macros closer to their
+  upstream counterparts.
+
+  Introduce %service_del_postun_without_restart which should help in
+  getting rid of '-f' and '-n' switches of %service_del_postun.
+
+---
+Thu Feb 21 17:53:18 UTC 2019 - Franck Bui 
+
+- Drop $YAST_IS_RUNNING in favor of $SYSTEMD_OFFLINE (bsc#1117489)
+
+  libzypp now kindly defines SYSTEMD_OFFLINE when appropriate (see
+  bsc#1118758). Therefore we don't need to rely on YAST_IS_RUNNING
+  anymore. It's a tiny step to make the SUSE macros closer to their
+  upstream counterparts.
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.TgrJQE/_old  2019-03-04 09:08:36.636725652 +0100
+++ /var/tmp/diff_new_pack.TgrJQE/_new  2019-03-04 09:08:36.640725652 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -17,7 +17,7 @@
 
 
 Name:   systemd-rpm-macros
-Version:3
+Version:4
 Release:0
 Summary:RPM macros for systemd
 License:LGPL-2.1-or-later

++ macros.systemd ++
--- /var/tmp/diff_new_pack.TgrJQE/_old  2019-03-04 09:08:36.668725647 +0100
+++ /var/tmp/diff_new_pack.TgrJQE/_new  2019-03-04 09:08:36.672725646 +0100
@@ -18,6 +18,7 @@
 #
 # %postun
 # %service_del_postun demo.service
+# %service_del_postun_without_restart demo.service
 #
 
 %_unitdir /usr/lib/systemd/system
@@ -50,33 +51,25 @@
 OrderWithRequires(postun): systemd \
 %{nil}
 
-%_restart_on_update_force() (\
-   test "$YAST_IS_RUNNING" = instsys && exit 0 \
-   %{?*:/usr/bin/systemctl try-restart %{*}} \
-   ) || : %{nil}
-%_restart_on_update_never() %{?*:# Restart of %{*} skipped} %{nil}
-%_restart_on_update() (\
-   test "$YAST_IS_RUNNING" = instsys && exit 0\
-   test -f /etc/sysconfig/services -a \\\
--z "$DISABLE_RESTART_ON_UPDATE" && . 
/etc/sysconfig/services\
-   test

commit systemd-rpm-macros for openSUSE:Factory

2018-12-10 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2018-12-10 12:22:13

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.19453 (New)


Package is "systemd-rpm-macros"

Mon Dec 10 12:22:13 2018 rev:26 rq:653628 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-05-25 21:33:51.347479302 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new.19453/systemd-rpm-macros.changes
 2018-12-10 12:22:18.546887932 +0100
@@ -1,0 +2,5 @@
+Fri Nov 23 12:08:30 UTC 2018 - Franck Bui 
+
+- systemd-sysv-convert has been moved from /usr/sbin to /usr/lib/systemd
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.YAsDut/_old  2018-12-10 12:22:19.234887247 +0100
+++ /var/tmp/diff_new_pack.YAsDut/_new  2018-12-10 12:22:19.234887247 +0100
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 

++ macros.systemd ++
--- /var/tmp/diff_new_pack.YAsDut/_old  2018-12-10 12:22:19.258887222 +0100
+++ /var/tmp/diff_new_pack.YAsDut/_new  2018-12-10 12:22:19.258887222 +0100
@@ -102,10 +102,10 @@
if [ -e /var/lib/systemd/migrated/$sysv_service ]; then 
\
continue
\
fi  
\
-   if [ ! -x /usr/sbin/systemd-sysv-convert ]; then
\
+   if [ ! -x /usr/lib/systemd/systemd-sysv-convert ]; then 
\
continue
\
fi  
\
-   /usr/sbin/systemd-sysv-convert --save $sysv_service || :
\
+   /usr/lib/systemd/systemd-sysv-convert --save $sysv_service || : 
\
done
\
 fi 
\
 %{nil}
@@ -138,10 +138,10 @@
if [ -e /var/lib/systemd/migrated/$sysv_service ]; then 
\
continue
\
fi  
\
-   if [ ! -x /usr/sbin/systemd-sysv-convert ]; then
\
+   if [ ! -x /usr/lib/systemd/systemd-sysv-convert ]; then 
\
continue
\
fi  
\
-   /usr/sbin/systemd-sysv-convert --apply $sysv_service || :   
\
+   /usr/lib/systemd/systemd-sysv-convert --apply $sysv_service || 
:\
touch /var/lib/systemd/migrated/$sysv_service || :  
\
done
\
 fi 
\

commit systemd-rpm-macros for openSUSE:Factory

2018-05-25 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2018-05-25 21:33:50

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Fri May 25 21:33:50 2018 rev:25 rq:611238 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-02-16 21:26:31.454388848 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2018-05-25 21:33:51.347479302 +0200
@@ -1,0 +2,10 @@
+Tue May 22 12:54:45 UTC 2018 - f...@suse.com
+
+- remove confusing --user before --global
+
+  Backport from
+  
https://github.com/systemd/systemd/commit/28d36da64a7a23a55e8d0a139f2620384fd058b3.
+
+  This was spotted in bsc#1090785.
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.33IKLx/_old  2018-05-25 21:33:51.971456723 +0200
+++ /var/tmp/diff_new_pack.33IKLx/_new  2018-05-25 21:33:51.975456579 +0200
@@ -20,7 +20,7 @@
 Version:3
 Release:0
 Summary:RPM macros for systemd
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
 Group:  Development/Tools/Building
 Url:http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
 Source0:macros.systemd

++ macros.systemd ++
--- /var/tmp/diff_new_pack.33IKLx/_old  2018-05-25 21:33:52.019454987 +0200
+++ /var/tmp/diff_new_pack.33IKLx/_new  2018-05-25 21:33:52.019454987 +0200
@@ -199,7 +199,7 @@
 fi 
\
 %{nil}
 
-%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}} 
+%systemd_user_post() %{expand:%systemd_post \\--global %%{?*}} 
 
 #
 # Options used if not in an installation systems
@@ -219,7 +219,7 @@
 %systemd_user_preun()  
\
 if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then   
\
 # Package removal, not upgrade 
\
-/usr/bin/systemctl --no-reload --user --global disable %{?*} || :  
\
+/usr/bin/systemctl --global disable %{?*} || : \
 fi 
\
 %{nil}

commit systemd-rpm-macros for openSUSE:Factory

2018-02-16 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2018-02-16 21:26:30

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Fri Feb 16 21:26:30 2018 rev:24 rq:576778 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-01-26 13:34:24.003585403 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2018-02-16 21:26:31.454388848 +0100
@@ -1,0 +2,12 @@
+Wed Feb 14 14:04:19 UTC 2018 - f...@suse.com
+
+- Fix %systemd_post(): it's never called during package removal
+
+  Also make it useful by restoring its original implementation.
+
+---
+Mon Feb 12 16:56:37 UTC 2018 - f...@suse.com
+
+- Import more definitions from upstream (v237)
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.64PbXE/_old  2018-02-16 21:26:32.850338468 +0100
+++ /var/tmp/diff_new_pack.64PbXE/_new  2018-02-16 21:26:32.850338468 +0100
@@ -20,16 +20,10 @@
 # %service_del_postun demo.service
 #
 
-# This is for systemctl
-%systemd_requires  
\
-Requires(pre): systemd 
\
-Requires(post): systemd
\
-Requires(preun): systemd   
\
-Requires(postun): systemd  
\
-
 %_unitdir /usr/lib/systemd/system
 %_userunitdir /usr/lib/systemd/user
 %_presetdir /usr/lib/systemd/system-preset
+%_userpresetdir /usr/lib/systemd/user-preset
 %_udevhwdbdir /usr/lib/udev/hwdb.d
 %_udevrulesdir /usr/lib/udev/rules.d
 %_journalcatalogdir /usr/lib/systemd/catalog
@@ -38,6 +32,23 @@
 %_sysctldir /usr/lib/sysctl.d
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
+%_systemdgeneratordir /usr/lib/systemd/system-generators
+%_systemdusergeneratordir /usr/lib/systemd/user-generators
+%_systemd_system_env_generator_dir 
/usr/lib/systemd/system-environment-generators
+%_systemd_user_env_generator_dir /usr/lib/systemd/user-environment-generators
+
+%systemd_requires \
+Requires(pre): systemd \
+Requires(post): systemd \
+Requires(preun): systemd \
+Requires(postun): systemd \
+%{nil}
+
+%systemd_ordering \
+OrderWithRequires(post): systemd \
+OrderWithRequires(preun): systemd \
+OrderWithRequires(postun): systemd \
+%{nil}
 
 %_restart_on_update_force() (\
test "$YAST_IS_RUNNING" = instsys && exit 0 \
@@ -181,18 +192,10 @@
 fi 
\
 %{nil}
 
-#
-# Options used if not in an installation systems
-#  -f that is fore service stop in removal
-#  -n that do not touch active service
-# the default is to check for DISABLE_STOP_ON_REMOVAL environment
-# variable if not found use the value read from /etc/sysconfig/services
-#
-%systemd_post(fn)  
\
-if [ "$1" -eq 0 -a -x /usr/bin/systemctl ]; then   
\
-   # Package removal, not upgrade  
\
-   /usr/bin/systemctl --no-reload disable %{?*} || :   
\
-   %{expand:%%_stop_on_removal%{-f:_force}%{!-f:%{-n:_never}} %{?*}}   
\
+%systemd_post()
\
+if [ $1 -eq 1 -a -x /usr/bin/systemctl ] ; then
\
+# Initial installation 
\
+/usr/bin/systemctl --no-reload preset %{?*} || :   
\
 fi 
\
 %{nil}

commit systemd-rpm-macros for openSUSE:Factory

2018-01-26 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2018-01-26 13:34:22

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Fri Jan 26 13:34:22 2018 rev:23 rq:568183 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2018-01-02 16:31:39.719016929 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2018-01-26 13:34:24.003585403 +0100
@@ -1,0 +2,6 @@
+Mon Jan 22 11:33:28 UTC 2018 - dims...@opensuse.org
+
+- Fix system_user_post macro for usage with RPM 4.14, backport from
+  https://github.com/systemd/systemd/commit/e67ba783.
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.VqX5Pw/_old  2018-01-26 13:34:24.991539257 +0100
+++ /var/tmp/diff_new_pack.VqX5Pw/_new  2018-01-26 13:34:24.995539070 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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

++ macros.systemd ++
--- /var/tmp/diff_new_pack.VqX5Pw/_old  2018-01-26 13:34:25.059536080 +0100
+++ /var/tmp/diff_new_pack.VqX5Pw/_new  2018-01-26 13:34:25.059536080 +0100
@@ -196,7 +196,7 @@
 fi 
\
 %{nil}
 
-%systemd_user_post() %systemd_post --user --global %{?*}
+%systemd_user_post() %{expand:%systemd_post \\--user \\--global %%{?*}} 
 
 #
 # Options used if not in an installation systems

commit systemd-rpm-macros for openSUSE:Factory

2018-01-02 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2018-01-02 16:31:39

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Tue Jan  2 16:31:39 2018 rev:22 rq:557293 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2017-11-21 15:17:50.592807895 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2018-01-02 16:31:39.719016929 +0100
@@ -1,0 +2,55 @@
+Thu Dec 14 08:39:15 UTC 2017 - f...@suse.com
+
+- Move macros.systemd in /usr/lib/rpm
+
+  The file is not supposed to be customized by the user.
+
+---
+Wed Dec 13 17:14:25 UTC 2017 - f...@suse.com
+
+- Make %systemd_add_pre() more similar to %systemd_add_post()
+
+  The main advantage is that we pass only one argument to
+  systemd-sysv-convert script. The later can now be improved/rewritten
+  to handle only one argument and return a useful exit status.
+
+---
+Wed Dec 13 16:42:56 UTC 2017 - f...@suse.com
+
+- Make sure to apply presets if packages start shipping units during upgrades 
(bsc#1071543)
+
+  If a package started shipping units during upgrade only sysv
+  migration was done. However if the package didn't ship any sysv
+  scripts before no presets were applied.
+
+  Now during upgrades, preset are always applied (still only during
+  the first time the units are installed) then followed by the sysv
+  migration machinery.
+
+  The downside of this is that migrated services can have symlinks in
+  both runlevel.target.wants/ (created by the sysv migration) and in
+  the directory specified by the [Install] sections (created by
+  "systemctl preset")...
+
+  The whole thing should be rewritten.
+
+---
+Fri Dec  1 10:47:29 UTC 2017 - f...@suse.com
+
+- Make sure to clean up "new-in-upgrade" tag file (bsc#1059627)
+
+  The tag file might have been incorrectly left by a preceding update.
+
+---
+Wed Nov 22 14:41:00 UTC 2017 - f...@suse.com
+
+- Restore previous changes
+
+---
+Fri Nov 17 09:23:14 UTC 2017 - f...@suse.com
+
+- Revert previous changes
+
+  Also added reasons why the previous changes would be needed.
+
+---
@@ -5,0 +61,8 @@
+
+  If you do transactional updates, it doesn't make any sense to
+  execute the tmpfiles. They will only create a lot of directories,
+  files or symlinks in empty directories without any use and later
+  hidden under the real mount points. With transactional updates, you
+  should do such things always during the boot phase, as designed by
+  systemd (and like Fedora and RHEL doing, but in their use case it's
+  in my opinion a bug).



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.7kdqMv/_old  2018-01-02 16:31:41.322482228 +0100
+++ /var/tmp/diff_new_pack.7kdqMv/_new  2018-01-02 16:31:41.326480894 +0100
@@ -39,9 +39,8 @@
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-install -m644 %{S:0} %{buildroot}%{_sysconfdir}/rpm
-UNITDIR="`cat %{S:0} | sed -n 's|.*_unitdir[[:blank:]]*||p'`"
+install -Dm644 %{S:0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.systemd
+UNITDIR="$(sed -n 's/.*_unitdir[[:blank:]]*//p' %{S:0})"
 for i in $UNITDIR `dirname $UNITDIR`; do
mkdir -p %{buildroot}$i
echo $i >> unitdir
@@ -49,6 +48,6 @@
 
 %files -f unitdir
 %defattr(-,root,root)
-%config %{_sysconfdir}/rpm/macros.systemd
+%{_rpmconfigdir}/macros.d/macros.systemd
 
 %changelog

++ macros.systemd ++
--- /var/tmp/diff_new_pack.7kdqMv/_old  2018-01-02 16:31:41.370466226 +0100
+++ /var/tmp/diff_new_pack.7kdqMv/_new  2018-01-02 16:31:41.374464893 +0100
@@ -78,19 +78,24 @@
done
\
 else   
\
for service in %{?*} ; do   
\
+   # The tag file might have been left by a preceding  
\
+   # update (see 1059627)  
\
+   rm -f "/run/rpm-%{name}-update-$service-new-in-upgrade" 
\
+

commit systemd-rpm-macros for openSUSE:Factory

2017-11-21 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2017-11-21 15:17:45

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Tue Nov 21 15:17:45 2017 rev:21 rq:542585 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2017-11-14 12:40:29.695659316 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2017-11-21 15:17:50.592807895 +0100
@@ -1,0 +2,6 @@
+Fri Nov 17 07:44:55 CET 2017 - ku...@suse.de
+
+- Don't execute systemd-tmpfiles if we run in transactional update
+  mode
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.UQqRi6/_old  2017-11-21 15:17:51.172786867 +0100
+++ /var/tmp/diff_new_pack.UQqRi6/_new  2017-11-21 15:17:51.172786867 +0100
@@ -246,7 +246,7 @@
 %{nil}
 
 %tmpfiles_create() \
-[ -x /usr/bin/systemd-tmpfiles ] && \
+[ -z "${TRANSACTIONAL_UPDATE}" -a -x /usr/bin/systemd-tmpfiles ] && \
/usr/bin/systemd-tmpfiles --create %{?*} || : \
 %{nil}

commit systemd-rpm-macros for openSUSE:Factory

2017-11-14 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2017-11-14 12:40:28

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Tue Nov 14 12:40:28 2017 rev:20 rq:540274 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2017-06-12 15:10:27.478379917 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2017-11-14 12:40:29.695659316 +0100
@@ -1,0 +2,8 @@
+Thu Nov  2 16:09:29 UTC 2017 - f...@suse.com
+
+- Remove a useless test in %service_add_pre()
+
+  The test was placed where the condition '[ "$FIRST_ARG" -gt 1 ]' was
+  always true.
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.4orHiX/_old  2017-11-14 12:40:30.215640295 +0100
+++ /var/tmp/diff_new_pack.4orHiX/_new  2017-11-14 12:40:30.215640295 +0100
@@ -77,13 +77,11 @@
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
done
\
 else   
\
-   if [ "$FIRST_ARG" -gt 1 ]; then 
\
-   for service in %{?*} ; do   
\
-   if [ ! -e "/usr/lib/systemd/system/$service" ]; then
\
-   touch 
"/run/rpm-%{name}-update-$service-new-in-upgrade" \
-   fi  
\
-   done
\
-   fi  
\
+   for service in %{?*} ; do   
\
+   if [ ! -e "/usr/lib/systemd/system/$service" ]; then
\
+   touch "/run/rpm-%{name}-update-$service-new-in-upgrade" 
\
+   fi  
\
+   done
\
for service in %{?*} ; do   
\
sysv_service="${service%%.*}"   
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then 
\
@@ -107,7 +105,7 @@
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
fi  
\
 done   
\
-if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then  
\
+if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then  
\
/usr/bin/systemctl daemon-reload || :   
\
 fi 
\
 if [ -n "$services_to_migrate" ]; then 
\

commit systemd-rpm-macros for openSUSE:Factory

2017-06-12 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2017-06-12 15:10:18

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Mon Jun 12 15:10:18 2017 rev:19 rq:501312 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2017-03-21 22:42:43.372679196 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2017-06-12 15:10:27.478379917 +0200
@@ -1,0 +2,15 @@
+Fri Jun  2 09:59:37 UTC 2017 - dims...@opensuse.org
+
+- BuildIgnore systemd-rpm-macros: a small cycle that can be
+  avoided. system-rpm-macros is being pulled in by rpm-build as
+  conveniance to the packagers.
+
+---
+Fri Jun  2 09:31:50 UTC 2017 - f...@suse.com
+
+- Reference bsc#956849 to please the new OBS 'sanity' check (bsc#1041386)
+
+  %tmpfiles_create is already part of the version shipped by Factory
+  so there's nothing to do here execpt mentioning (bsc#956849).
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.SQv8D2/_old  2017-06-12 15:10:29.598080828 +0200
+++ /var/tmp/diff_new_pack.SQv8D2/_new  2017-06-12 15:10:29.602080263 +0200
@@ -28,6 +28,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 #!BuildIgnore:  util-linux
+#!BuildIgnore:  %{name}
 
 %description
 Starting with openSUSE 12.1, several RPM macros must be used to package systemd

commit systemd-rpm-macros for openSUSE:Factory

2017-03-21 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2017-03-21 22:42:35

Comparing /work/SRC/openSUSE:Factory/systemd-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.systemd-rpm-macros.new (New)


Package is "systemd-rpm-macros"

Tue Mar 21 22:42:35 2017 rev:18 rq:479261 version:3

Changes:

--- /work/SRC/openSUSE:Factory/systemd-rpm-macros/systemd-rpm-macros.changes
2017-01-19 10:35:34.899060237 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2017-03-21 22:42:43.372679196 +0100
@@ -1,0 +2,16 @@
+Fri Mar 10 11:54:11 UTC 2017 - f...@suse.com
+
+- Kill preset macros
+
+  The last users have been fixed so these macros are no more used by
+  any package.
+
+  The introduction of them was a bad idea and only the branding preset
+  package is still using a similar mechanism but at least it's now
+  self contained in this package. Also the package calls now a shell
+  script instead of rpm macros.
+
+  Upstream is working on making this completely obsolete so the preset
+  branding package could be cleaned up for good.
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.W6elBx/_old  2017-03-21 22:42:44.068580878 +0100
+++ /var/tmp/diff_new_pack.W6elBx/_new  2017-03-21 22:42:44.068580878 +0100
@@ -19,17 +19,6 @@
 # %postun
 # %service_del_postun demo.service
 #
-###
-#
-# When a package install systemd preset files, it should use the following 
macros:
-#
-# %pre -p /bin/bash
-# %systemd_preset_pre
-#
-# %posttrans -p /bin/bash
-# %systemd_preset_posttrans
-#
-###
 
 # This is for systemctl
 %systemd_requires  
\
@@ -282,116 +271,3 @@
 [ -x /usr/lib/systemd/systemd-binfmt ] && \
/usr/lib/systemd/systemd-binfmt %{?*} || : \
 %{nil}
-
-%systemd_preset_pre() \
-if ! test -f /usr/lib/systemd/system-preset/99-default-disable.preset ; then \
-   mkdir -p /usr/lib/systemd/system-preset; \
-   touch /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp; \
-else \
-   cd /usr/lib/systemd/system-preset; \
-   declare -a PRESET_FILES; \
-   declare -A PRESETS; \
-   PRESET_FILES=(*.preset); \
-   if ! test -f systemd_preset-old.rpm-tmp ; then \
-   for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
-   FILE=${PRESET_FILES[i]}; \
-   exec 3<"$FILE"; \
-   while read -u3 ENABLE SERVICE PAD ; do \
-   if test -z "$SERVICE" ; then \
-   continue; \
-   fi; \
-   case "$ENABLE" in \
-   enable|disable) \
-   PRESETS[$SERVICE]=$ENABLE;; \
-   esac; \
-   done; \
-   exec 3<&-; \
-   done; \
-   exec 3>systemd_preset-old.rpm-tmp; \
-   for PRESET in "${!PRESETS[@]}" ; do \
-   echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
-   done; \
-   exec 3>&-; \
-   fi; \
-fi; \
-%{nil}
-
-%systemd_preset_posttrans() \
-if test -f /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp ; then \
-   rm -f /usr/lib/systemd/system-preset/systemd_preset-{old,skip}.rpm-tmp; 
\
-fi; \
-cd /usr/lib/systemd/system-preset; \
-if test -f systemd_preset-old.rpm-tmp ; then \
-   declare -a PRESET_FILES; \
-   declare -A PRESETS_OLD; \
-   declare -A PRESETS_OLD_WILDCARD; \
-   declare -A PRESETS; \
-   declare -A PRESETS_WILDCARD; \
-   exec 3= 0 ; i-- )) ; do \
-   FILE=${PRESET_FILES[i]}; \
-   exec 3<"$FILE"; \
-   while read -u3 ENABLE SERVICE PAD ; do \
-   if test -z "$SERVICE" ; then \
-   continue; \
-   fi; \
-   case "$ENABLE" in \
-

commit systemd-rpm-macros for openSUSE:Factory

2017-01-19 Thread root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2017-01-19 10:35:33

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
2016-06-12 18:50:13.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2017-01-19 10:35:34.899060237 +0100
@@ -1,0 +2,5 @@
+Wed Jan 11 11:16:11 UTC 2017 - jeng...@inai.de
+
+- RPM group fix
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.W2EeSs/_old  2017-01-19 10:35:35.251010596 +0100
+++ /var/tmp/diff_new_pack.W2EeSs/_new  2017-01-19 10:35:35.251010596 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2016 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
@@ -21,7 +21,7 @@
 Release:0
 Summary:RPM macros for systemd
 License:LGPL-2.1+
-Group:  System/Base
+Group:  Development/Tools/Building
 Url:http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
 Source0:macros.systemd
 Requires:   coreutils

commit systemd-rpm-macros for openSUSE:Factory

2016-06-12 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2016-06-12 18:50:11

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
2016-03-05 13:04:56.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2016-06-12 18:50:13.0 +0200
@@ -1,0 +2,6 @@
+Fri Jun  3 14:47:01 UTC 2016 - thomas.bl...@suse.com
+
+- %service_add_post() suppress daemon-reload when in installation 
+  system (bsc#982343)
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.dR4kH8/_old  2016-06-12 18:50:14.0 +0200
+++ /var/tmp/diff_new_pack.dR4kH8/_new  2016-06-12 18:50:14.0 +0200
@@ -118,7 +118,7 @@
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
fi  
\
 done   
\
-if [ -x /usr/bin/systemctl ]; then 
\
+if [ "$YAST_IS_RUNNING" != "instsys" -a -x /usr/bin/systemctl ]; then  
\
/usr/bin/systemctl daemon-reload || :   
\
 fi 
\
 if [ -n "$services_to_migrate" ]; then 
\

commit systemd-rpm-macros for openSUSE:Factory

2016-03-05 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2016-03-05 13:04:54

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
2015-11-26 17:00:41.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2016-03-05 13:04:56.0 +0100
@@ -1,0 +2,15 @@
+Thu Mar  3 10:01:52 UTC 2016 - wer...@suse.de
+
+- Allow the packagers to specify the options -f and -n on the
+  macros %service_del_preun(), %service_del_postun(), %systemd_post(),
+  and %systemd_preun() (boo#968405) 
+
+---
+Sat Feb 27 10:18:55 UTC 2016 - dims...@opensuse.org
+
+- Also honor DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE
+  when specified by a package directly in the .spec file. Some
+  package know that a restart of their service is fatal
+  (boo#968405).
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.35RkCw/_old  2016-03-05 13:04:57.0 +0100
+++ /var/tmp/diff_new_pack.35RkCw/_new  2016-03-05 13:04:57.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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

++ macros.systemd ++
--- /var/tmp/diff_new_pack.35RkCw/_old  2016-03-05 13:04:57.0 +0100
+++ /var/tmp/diff_new_pack.35RkCw/_new  2016-03-05 13:04:57.0 +0100
@@ -50,17 +50,33 @@
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
 
-%_restart_check_systemctl  
\
-   test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
-   test "$YAST_IS_RUNNING" = instsys   && exit 0   
\
-   test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0   
\
-   /usr/bin/systemctl try-restart %{nil}
-
-%_stop_check_systemctl 
\
-   test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
-   test "$YAST_IS_RUNNING" = instsys && exit 0 
\
-   test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0 
\
-   /usr/bin/systemctl stop %{nil}
+%_restart_on_update_force() (\
+   test "$YAST_IS_RUNNING" = instsys && exit 0 \
+   %{?*:/usr/bin/systemctl try-restart %{*}} \
+   ) || : %{nil}
+%_restart_on_update_never() %{?*:# Restart of %{*} skipped} %{nil}
+%_restart_on_update() (\
+   test "$YAST_IS_RUNNING" = instsys && exit 0\
+   test -f /etc/sysconfig/services -a \\\
+-z "$DISABLE_RESTART_ON_UPDATE" && . 
/etc/sysconfig/services\
+   test "$DISABLE_RESTART_ON_UPDATE" = yes -o \\\
+"$DISABLE_RESTART_ON_UPDATE" = 1 && exit 0\
+   %{?*:/usr/bin/systemctl try-restart %{*}}\
+   ) || : %{nil}
+
+%_stop_on_removal_force() ( \
+   test "$YAST_IS_RUNNING" = instsys && exit 0\
+   %{?*:/usr/bin/systemctl stop %{*}}\
+   ) || : %{nil}
+%_stop_on_removal_never() %{?*:# Stop of %{*} skipped} %{nil}
+%_stop_on_removal() (\
+   test "$YAST_IS_RUNNING" = instsys && exit 0\
+   test -f /etc/sysconfig/services -a \\\
+-z "$DISABLE_STOP_ON_REMOVAL" && . /etc/sysconfig/services\
+   test "$DISABLE_STOP_ON_REMOVAL" = yes -o \\\
+"$DISABLE_STOP_ON_REMOVAL" = 1 && exit 0\
+   %{?*:/usr/bin/systemctl stop %{*}}\
+   ) || : %{nil}
 
 %service_add_pre() 
\
 test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
@@ -128,23 +144,38 @@
 %{nil}
 
 # On uninstall, disable and stop services
-%service_del_preun()   
\
+#
+# Options used if not in an installation systems
+#  -f that is fore service stop in removal
+#  -n that do not touch active service
+# the default is to

commit systemd-rpm-macros for openSUSE:Factory

2015-11-26 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2015-11-26 17:00:40

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
2015-10-14 16:34:30.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2015-11-26 17:00:41.0 +0100
@@ -1,0 +2,6 @@
+Fri Nov 20 16:53:23 UTC 2015 - wer...@suse.de
+
+- Support of DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE 
+  from /etc/sysconfig/service (bsc#955996)
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.29tFpy/_old  2015-11-26 17:00:42.0 +0100
+++ /var/tmp/diff_new_pack.29tFpy/_new  2015-11-26 17:00:42.0 +0100
@@ -50,13 +50,25 @@
 %_ntpunitsdir /usr/lib/systemd/ntp-units.d
 %_binfmtdir /usr/lib/binfmt.d
 
+%_restart_check_systemctl  
\
+   test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
+   test "$YAST_IS_RUNNING" = instsys   && exit 0   
\
+   test "$DISABLE_RESTART_ON_UPDATE" = yes && exit 0   
\
+   /usr/bin/systemctl try-restart %{nil}
+
+%_stop_check_systemctl 
\
+   test -f /etc/sysconfig/services && . /etc/sysconfig/services
\
+   test "$YAST_IS_RUNNING" = instsys && exit 0 
\
+   test "$DISABLE_STOP_ON_REMOVAL" = yes && exit 0 
\
+   /usr/bin/systemctl stop %{nil}
+
 %service_add_pre() 
\
 test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
 # disable migration if initial install under systemd   
\
 [ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
 if [ "$FIRST_ARG" -eq 1 ]; then
\
for service in %{?*} ; do   
\
-   sysv_service="${service%.*}"
\
+   sysv_service="${service%%.*}"   
\
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
done
\
 else   
\
@@ -68,7 +80,7 @@
done
\
fi  
\
for service in %{?*} ; do   
\
-   sysv_service="${service%.*}"
\
+   sysv_service="${service%%.*}"   
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then 
\
services_to_migrate="$services_to_migrate 
$sysv_service"\
fi  
\
@@ -84,7 +96,7 @@
 test -n "$FIRST_ARG" || FIRST_ARG="$1" 
\
 [ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
 for service in %{?*} ; do  
\
-   sysv_service="${service%.*}"
\
+   sysv_service="${service%%.*}"   
\
if [ ! -e "/var/lib/systemd/migrated/$sysv_service" ]; then 
\
services_to_migrate="$services_to_migrate $sysv_service"
\
touch "/var/lib/systemd/migrated/$sysv_service" || :
\
@@ -121,7 +133,7 @@
 if [ "$FIRST_ARG" -eq 0 -a -x /usr/bin/systemctl ]; then   
\
# Package removal, not upgrade  
\
/usr/bin/systemctl --no-reload disable %{?*} || :   
\
-   /usr/bin/systemctl stop %{?*} || :

commit systemd-rpm-macros for openSUSE:Factory

2015-10-14 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2015-10-14 16:34:29

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
2015-09-19 06:51:37.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2015-10-14 16:34:30.0 +0200
@@ -1,0 +2,6 @@
+Fri Sep 18 15:27:04 CEST 2015 - sbra...@suse.com
+
+- Skip %systemd_preset_* during the clean installation to prevent
+  presetting of all services (boo#946216).
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.bgcdhQ/_old  2015-10-14 16:34:31.0 +0200
+++ /var/tmp/diff_new_pack.bgcdhQ/_new  2015-10-14 16:34:31.0 +0200
@@ -228,42 +228,50 @@
 %{nil}
 
 %systemd_preset_pre() \
-cd /usr/lib/systemd/system-preset; \
-declare -a PRESET_FILES; \
-declare -A PRESETS; \
-PRESET_FILES=(*.preset); \
-if ! test -f presets-all.rpm-tmp ; then \
-   for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
-   FILE=${PRESET_FILES[i]}; \
-   exec 3<"$FILE"; \
-   while read -u3 ENABLE SERVICE PAD ; do \
-   if test -z "$SERVICE" ; then \
-   continue; \
-   fi; \
-   case "$ENABLE" in \
-   enable|disable) \
-   PRESETS[$SERVICE]=$ENABLE;; \
-   esac; \
+if ! test -f /usr/lib/systemd/system-preset/99-default-disable.preset ; then \
+   mkdir -p /usr/lib/systemd/system-preset; \
+   touch /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp; \
+else \
+   cd /usr/lib/systemd/system-preset; \
+   declare -a PRESET_FILES; \
+   declare -A PRESETS; \
+   PRESET_FILES=(*.preset); \
+   if ! test -f systemd_preset-old.rpm-tmp ; then \
+   for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
+   FILE=${PRESET_FILES[i]}; \
+   exec 3<"$FILE"; \
+   while read -u3 ENABLE SERVICE PAD ; do \
+   if test -z "$SERVICE" ; then \
+   continue; \
+   fi; \
+   case "$ENABLE" in \
+   enable|disable) \
+   PRESETS[$SERVICE]=$ENABLE;; \
+   esac; \
+   done; \
+   exec 3<&-; \
done; \
-   exec 3<&-; \
-   done; \
-   exec 3>presets-all.rpm-tmp; \
-   for PRESET in "${!PRESETS[@]}" ; do \
-   echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
-   done; \
-   exec 3>&-; \
+   exec 3>systemd_preset-old.rpm-tmp; \
+   for PRESET in "${!PRESETS[@]}" ; do \
+   echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
+   done; \
+   exec 3>&-; \
+   fi; \
 fi; \
 %{nil}
 
 %systemd_preset_posttrans() \
+if test -f /usr/lib/systemd/system-preset/systemd_preset-skip.rpm-tmp ; then \
+   rm -f /usr/lib/systemd/system-preset/systemd_preset-{old,skip}.rpm-tmp; 
\
+fi; \
 cd /usr/lib/systemd/system-preset; \
-declare -a PRESET_FILES; \
-declare -A PRESETS_OLD; \
-declare -A PRESETS_OLD_WILDCARD; \
-declare -A PRESETS; \
-declare -A PRESETS_WILDCARD; \
-if test -f presets-all.rpm-tmp ; then \
-   exec 3service-states.rpm-tmp; \
-   exec 3systemd_preset-states.rpm-tmp; \
+   exec 3

commit systemd-rpm-macros for openSUSE:Factory

2015-09-18 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2015-09-19 06:51:35

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
2015-07-21 13:24:39.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2015-09-19 06:51:37.0 +0200
@@ -1,0 +2,9 @@
+Tue Aug  4 17:59:54 CEST 2015 - sbra...@suse.com
+
+- Add %systemd_preset_pre and %systemd_preset_posttrans that will
+  do one shot presetting of all services with changed system
+  preset. It makes possible to to fix bad default service state
+  (bnc#900935#c46, FATE#318949, FATE#317727, bnc#921075).
+- Increment version to 3.
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.gODXRY/_old  2015-09-19 06:51:39.0 +0200
+++ /var/tmp/diff_new_pack.gODXRY/_new  2015-09-19 06:51:39.0 +0200
@@ -17,7 +17,7 @@
 
 
 Name:   systemd-rpm-macros
-Version:2
+Version:3
 Release:0
 Summary:RPM macros for systemd
 License:LGPL-2.1+

++ macros.systemd ++
--- /var/tmp/diff_new_pack.gODXRY/_old  2015-09-19 06:51:39.0 +0200
+++ /var/tmp/diff_new_pack.gODXRY/_new  2015-09-19 06:51:39.0 +0200
@@ -18,7 +18,17 @@
 #
 # %postun
 # %service_del_postun demo.service
-# 
+#
+###
+#
+# When a package install systemd preset files, it should use the following 
macros:
+#
+# %pre -p /bin/bash
+# %systemd_preset_pre
+#
+# %posttrans -p /bin/bash
+# %systemd_preset_posttrans
+#
 ###
 
 # This is for systemctl
@@ -216,3 +226,108 @@
 [ -x /usr/lib/systemd/systemd-binfmt ] && \
/usr/lib/systemd/systemd-binfmt %{?*} || : \
 %{nil}
+
+%systemd_preset_pre() \
+cd /usr/lib/systemd/system-preset; \
+declare -a PRESET_FILES; \
+declare -A PRESETS; \
+PRESET_FILES=(*.preset); \
+if ! test -f presets-all.rpm-tmp ; then \
+   for ((i=${#PRESET_FILES[@]}-1 ; i>= 0 ; i-- )) ; do \
+   FILE=${PRESET_FILES[i]}; \
+   exec 3<"$FILE"; \
+   while read -u3 ENABLE SERVICE PAD ; do \
+   if test -z "$SERVICE" ; then \
+   continue; \
+   fi; \
+   case "$ENABLE" in \
+   enable|disable) \
+   PRESETS[$SERVICE]=$ENABLE;; \
+   esac; \
+   done; \
+   exec 3<&-; \
+   done; \
+   exec 3>presets-all.rpm-tmp; \
+   for PRESET in "${!PRESETS[@]}" ; do \
+   echo >&3 "${PRESETS[$PRESET]} $PRESET"; \
+   done; \
+   exec 3>&-; \
+fi; \
+%{nil}
+
+%systemd_preset_posttrans() \
+cd /usr/lib/systemd/system-preset; \
+declare -a PRESET_FILES; \
+declare -A PRESETS_OLD; \
+declare -A PRESETS_OLD_WILDCARD; \
+declare -A PRESETS; \
+declare -A PRESETS_WILDCARD; \
+if test -f presets-all.rpm-tmp ; then \
+   exec 3= 0 ; i-- )) ; do \
+   FILE=${PRESET_FILES[i]}; \
+   exec 3<"$FILE"; \
+   while read -u3 ENABLE SERVICE PAD ; do \
+   if test -z "$SERVICE" ; then \
+   continue; \
+   fi; \
+   case "$ENABLE" in \
+   enable|disable) \
+   case $SERVICE in \
+   *"*"*|*"?"*) 
PRESETS_WILDCARD[$SERVICE]=$ENABLE;; \
+   *) PRESETS[$SERVICE]=$ENABLE;; \
+   esac;; \
+   esac; \
+   done; \
+   exec 3<&-; \
+   done; \
+   if test -x /usr/bin/systemctl ; then \
+   /usr/bin/systemctl --type=service,socket list-unit-files; \
+   fi >service-states.rpm-tmp; \
+   exec 3

commit systemd-rpm-macros for openSUSE:Factory

2015-07-21 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2015-07-21 13:24:38

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
2015-01-30 06:00:50.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2015-07-21 13:24:39.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 15 11:33:28 UTC 2015 - jeng...@inai.de
+
+- Check for presence/executability of systemd programs before
+  executing them, and do not suppress warnings/errors resulting
+  from them.
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.LkTRjO/_old  2015-07-21 13:24:39.0 +0200
+++ /var/tmp/diff_new_pack.LkTRjO/_new  2015-07-21 13:24:39.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package systemd-rpm-macros
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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

++ macros.systemd ++
--- /var/tmp/diff_new_pack.LkTRjO/_old  2015-07-21 13:24:39.0 +0200
+++ /var/tmp/diff_new_pack.LkTRjO/_new  2015-07-21 13:24:39.0 +0200
@@ -41,157 +41,178 @@
 %_binfmtdir /usr/lib/binfmt.d
 
 %service_add_pre() 
\
-test -n $FIRST_ARG || FIRST_ARG=$1   
\
+test -n $FIRST_ARG || FIRST_ARG=$1 
\
 # disable migration if initial install under systemd   
\
 [ -d /var/lib/systemd/migrated ] || mkdir -p /var/lib/systemd/migrated || :
\
-if [ $FIRST_ARG -eq 1 ]; then  
\
-  for service in %{?*} ; do
\
-sysv_service=${service%.*} 
\
-touch /var/lib/systemd/migrated/$sysv_service || :   
\
-  done 
\
+if [ $FIRST_ARG -eq 1 ]; then
\
+   for service in %{?*} ; do   
\
+   sysv_service=${service%.*}
\
+   touch /var/lib/systemd/migrated/$sysv_service || :
\
+   done
\
 else   
\
-  if [ $FIRST_ARG -gt 1 ]; then
\
-for service in %{?*} ; do  
\
-  if [ ! -e /usr/lib/systemd/system/$service ]; then 
\
-   touch /run/rpm-%{name}-update-$service-new-in-upgrade 
\
-  fi   
\
-done   
\
-  fi   
\
-  for service in %{?*} ; do
\
-sysv_service=${service%.*} 
\
-if [ ! -e /var/lib/systemd/migrated/$sysv_service ]; then
\
-  services_to_migrate=$services_to_migrate $sysv_service 
\
-fi 
\
-  done 
\
-  if [ -n $services_to_migrate ]; then   
\
-/usr/sbin/systemd-sysv-convert --save $services_to_migrate /dev/null 21 
|| :\
-  fi   
\
+   if [ $FIRST_ARG -gt 1 ]; then 
\
+   for service in %{?*} ; do   
\
+   if [ ! -e

commit systemd-rpm-macros for openSUSE:Factory

2015-01-29 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2015-01-30 06:00:48

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-12-01 14:00:32.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2015-01-30 06:00:50.0 +0100
@@ -1,0 +2,6 @@
+Fri Jan  9 13:38:16 UTC 2015 - jeng...@inai.de
+
+- Update with new macros from systemd 218
+- Remove empty sections from specfile
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Mx3UwV/_old  2015-01-30 06:00:52.0 +0100
+++ /var/tmp/diff_new_pack.Mx3UwV/_new  2015-01-30 06:00:52.0 +0100
@@ -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 @@
 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 @@
echo $i  unitdir
 done
 
-%post
-
-%postun
-
 %files -f unitdir
 %defattr(-,root,root)
 %config %{_sysconfdir}/rpm/macros.systemd

++ macros.systemd ++
--- /var/tmp/diff_new_pack.Mx3UwV/_old  2015-01-30 06:00:52.0 +0100
+++ /var/tmp/diff_new_pack.Mx3UwV/_new  2015-01-30 06:00:52.0 +0100
@@ -35,6 +35,7 @@
 %_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 @@
 /usr/bin/systemctl daemon-reload /dev/null 21 || :  
\
 %{nil}
 
+%systemd_user_postun() %{nil}
+%systemd_user_postun_with_restart() %{nil}
+
 %systemd_postun_with_restart() 
\
 @rootbindir@/systemctl daemon-reload /dev/null 21 || :  
\
 if [ $1 -ge 1 ] ; then 
\
@@ -175,6 +179,14 @@
 /usr/bin/systemd-tmpfiles --create %{?*} /dev/null 21 || : \
 %{nil}
 
+%sysusers_create() \
+systemd-sysusers %{?*} /dev/null 21 || : \
+%{nil}
+
+%sysusers_create_inline() \
+echo %{?*} | systemd-sysusers - /dev/null 21 || : \
+%{nil}
+
 %sysctl_apply() \
 /usr/lib/systemd/systemd-sysctl %{?*} /dev/null 21 || : \
 %{nil}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit systemd-rpm-macros for openSUSE:Factory

2014-12-01 Thread h_root

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.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2014-12-01 14:00:32.0 +0100
@@ -1,0 +2,11 @@
+Tue Nov 18 15:16:13 UTC 2014 - wer...@suse.de
+
+- Mark /etc/rpm/macros.systemd as configuration file 
+
+---
+Tue Nov 18 13:30:37 UTC 2014 - wer...@suse.de
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.KOfrZU/_new  2014-12-01 14:00:33.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.KOfrZU/_new  2014-12-01 14:00:33.0 +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 21 || :
\
+ /usr/bin/systemctl --no-reload disable %{?*}  /dev/null 21 || :
\
  /usr/bin/systemctl stop %{?*}  /dev/null 21 || :   
\
 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 21 || :  
\
-  fi \
+/usr/bin/systemctl daemon-reload /dev/null 21 || :  
\
+/usr/bin/systemctl try-restart %{?*} /dev/null 21 || :  
\
+  fi   
\
 else # package

commit systemd-rpm-macros for openSUSE:Factory

2014-10-19 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2014-10-19 19:27:24

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-04-06 09:54:00.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2014-10-19 19:27:25.0 +0200
@@ -1,0 +2,6 @@
+Wed Oct 15 09:28:36 UTC 2014 - thomas.bl...@suse.com
+
+- make systemd aware of changed unit file content after update
+  add systemd-daemon-reload-before-service-restart.patch 
+ 
+---

New:

  systemd-daemon-reload-before-service-restart.patch



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.QYfNW2/_old  2014-10-19 19:27:25.0 +0200
+++ /var/tmp/diff_new_pack.QYfNW2/_new  2014-10-19 19:27:25.0 +0200
@@ -29,12 +29,16 @@
 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
 services files. This package provides these macros.
 
 %prep
+cd %{_sourcedir}
+%patch0 -p1
 
 %build
 

++ systemd-daemon-reload-before-service-restart.patch ++
diff -Naur orig/macros.systemd mod/macros.systemd
--- orig/macros.systemd 2014-10-14 08:54:56.264889350 +0200
+++ mod/macros.systemd  2014-10-15 13:10:43.134133358 +0200
@@ -108,6 +108,7 @@
 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 daemon-reload /dev/null 21 || :  
\
 /usr/bin/systemctl try-restart %{?*} /dev/null 21 || :  
\
   fi \
 else # package uninstall   
\
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit systemd-rpm-macros for openSUSE:Factory

2014-04-06 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2014-04-06 09:53:59

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-02-28 16:25:26.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2014-04-06 09:54:00.0 +0200
@@ -1,0 +2,11 @@
+Thu Mar 27 14:44:53 UTC 2014 - wer...@suse.de
+
+- Add a %_ntpunitsdir macro 
+
+---
+Thu Mar 27 12:22:11 UTC 2014 - fcro...@suse.com
+
+- Add support to not restart services if running in YaST2 or
+  if DISABLE_RESTART_ON_UPDATE is set to yes [bnc#858429]
+
+---



Other differences:
--
++ macros.systemd ++
--- /var/tmp/diff_new_pack.CdSwC4/_old  2014-04-06 09:54:00.0 +0200
+++ /var/tmp/diff_new_pack.CdSwC4/_new  2014-04-06 09:54:00.0 +0200
@@ -35,6 +35,7 @@
 %_journalcatalogdir /usr/lib/systemd/catalog
 %_tmpfilesdir /usr/lib/tmpfiles.d
 %_sysctldir /usr/lib/sysctl.d
+%_ntpunitsdir /usr/lib/systemd/ntp-units.d
 
 %service_add_pre() 
\
 test -n $FIRST_ARG || FIRST_ARG=$1   
\
@@ -106,7 +107,9 @@
 test -n $FIRST_ARG || FIRST_ARG=$1   
\
 if [ $FIRST_ARG -ge 1 ]; then  
\
 # Package upgrade, not uninstall   
\
-  /usr/bin/systemctl try-restart %{?*} /dev/null 21 || :
\
+  if test $YAST_IS_RUNNING != instsys -a $DISABLE_RESTART_ON_UPDATE != 
yes ; then \
+/usr/bin/systemctl try-restart %{?*} /dev/null 21 || :  
\
+  fi \
 else # package uninstall   
\
   for service in %{?*} ; do
\
 sysv_service=${service%.*} 
\

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit systemd-rpm-macros for openSUSE:Factory

2014-02-28 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2014-02-28 16:25:24

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-02-11 10:46:34.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2014-02-28 16:25:26.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 28 10:10:24 UTC 2014 - wer...@suse.de
+
+- Require coreutils as rm and touch are used
+
+---



Other differences:
--
++ systemd-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.303VpC/_old  2014-02-28 16:25:26.0 +0100
+++ /var/tmp/diff_new_pack.303VpC/_new  2014-02-28 16:25:26.0 +0100
@@ -26,6 +26,7 @@
 Group:  System/Base
 Url:http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines
 Source0:macros.systemd
+Requires:   coreutils
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildArch:  noarch
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit systemd-rpm-macros for openSUSE:Factory

2014-02-11 Thread h_root

Hello community,

here is the log from the commit of package systemd-rpm-macros for 
openSUSE:Factory checked in at 2014-02-11 10:46:34

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-02-07 14:56:44.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.systemd-rpm-macros.new/systemd-rpm-macros.changes   
2014-02-11 10:46:34.0 +0100
@@ -1,0 +2,6 @@
+Fri Feb  7 12:43:13 UTC 2014 - wer...@suse.de
+
+- Make systemd rpm macros package a separate to avoid rebuild of
+  the full package tree if systemd package change 
+
+---

Old:

  0001-Fix-bad-assert-in-show_pid_array.patch
  0001-Never-call-qsort-on-potentially-NULL-arrays.patch
  0001-On_s390_con3270_disable_ANSI_colour_esc.patch
  0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch
  0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch
  0001-analyze-set-text-on-side-with-most-space.patch
  0001-analyze-set-white-background.patch
  0001-core-introduce-new-KillMode-mixed-which-sends-SIGTER.patch
  0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch
  0001-core-unify-the-way-we-denote-serialization-attribute.patch
  0001-dbus-common-avoid-leak-in-error-path.patch
  0001-do-not-accept-garbage-from-acpi-firmware-performance.patch
  0001-drop-ins-check-return-value.patch
  0001-gpt-auto-generator-exit-immediately-if-in-container.patch
  0001-journald-fix-minor-memory-leak.patch
  0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch
  0001-login-fix-invalid-free-in-sd_session_get_vt.patch
  0001-login-make-sd_session_get_vt-actually-work.patch
  0001-logind-fix-bus-introspection-data-for-TakeControl.patch
  0001-logind-garbage-collect-stale-users.patch
  0001-manager-when-verifying-whether-clients-may-change-en.patch
  0001-mount-check-for-NULL-before-reading-pm-what.patch
  0001-shared-util-Fix-glob_extend-argument.patch
  0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
  0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch
  0001-systemd-serialize-deserialize-forbid_restart-value.patch
  0001-upstream-systemctl-halt-reboot-error-handling.patch
  0002-fix-lingering-references-to-var-lib-backlight-random.patch
  0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch
  0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch
  0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch
  0004-systemctl-fix-name-mangling-for-sysv-units.patch
  0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch
  0006-journald-add-missing-error-check.patch
  0007-bus-fix-potentially-uninitialized-memory-access.patch
  0008-dbus-fix-return-value-of-dispatch_rqueue.patch
  0009-modules-load-fix-error-handling.patch
  0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch
  0011-strv-don-t-access-potentially-NULL-string-arrays.patch
  0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch
  0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch
  1001-re-enable-by_path-links-for-ata-devices.patch
  1002-rules-create-by-id-scsi-links-for-ATA-devices.patch
  1003-udev-netlink-null-rules.patch
  1005-create-default-links-for-primary-cd_dvd-drive.patch
  1006-udev-always-rename-network.patch
  1007-physical-hotplug-cpu-and-memory.patch
  1008-add-msft-compability-rules.patch
  1009-make-xsltproc-use-correct-ROFF-links.patch
  1010-do-not-install-sulogin-unit-with-poweroff.patch
  1011-check-4-valid-kmsg-device.patch
  1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch
  1014-journald-with-journaling-FS.patch
  1016-support-powerfail-with-powerstatus.patch
  1017-skip-native-unit-handling-if-sysv-already-handled.patch
  1018-Make-LSB-Skripts-know-about-Required-and-Should.patch
  1019-make-completion-smart-to-be-able-to-redirect.patch
  Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch
  Forward-suspend-hibernate-calls-to-pm-utils.patch
  Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
  U_logind_revert_lazy_session_activation_on_non_vt_seats.patch
  after-local.service
  allow-multiple-sulogin-to-be-started.patch
  analyze-fix-crash-in-command-line-parsing.patch
  apply-ACL-for-nvidia-device-nodes.patch
  avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch
  baselibs.conf
  boot.udev
  build-sys-make-multi-seat-x-optional.patch
  delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch
  disable-nss-myhostname-warning-bnc-783841.patch
  ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch
  ensure-ask-password-wall-starts-after-getty-tty1.patch

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

commit systemd-rpm-macros for openSUSE:Factory

26 matches

Site Navigation

Mail list logo

Footer information