From 783484c31569f83a77048ff7deb25331f756a31c416419ebfce1f98b484165e9 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 13 Feb 2017 12:54:49 +0000
Subject: [PATCH] Accepting request 455978 from home:fbui:branches:Base:System

- presets are managed by the branding presets package (bsc#1012850)
  The default activation state is defined by the branding preset
  package.
  This also get rid of the only use of the rpm preset macros so we can
  kill them.

OBS-URL: https://build.opensuse.org/request/show/455978
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=330
---
 python-libmount.changes    | 11 +++++++++++
 python-libmount.spec       | 12 ++++--------
 util-linux-systemd.changes | 11 +++++++++++
 util-linux-systemd.spec    |  9 ++-------
 util-linux.changes         | 11 +++++++++++
 util-linux.spec            |  9 ++-------
 6 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index 967a5df..c887967 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
+
+- presets are managed by the branding presets package (bsc#1012850)
+
+  The default activation state is defined by the branding preset
+  package.
+
+  This also get rid of the only use of the rpm preset macros so we can
+  kill them.
+
 -------------------------------------------------------------------
 Tue Feb  7 20:07:55 CET 2017 - sbrabec@suse.com
 
diff --git a/python-libmount.spec b/python-libmount.spec
index addfaea..538de03 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -69,7 +69,7 @@ Name:           python-libmount
 %endif
 Summary:        %main_summary
 License:        GPL-2.0+
-Group:          %main_group
+Group:          %group_pl
 BuildRequires:  audit-devel
 BuildRequires:  bc
 BuildRequires:  binutils-devel
@@ -173,6 +173,8 @@ Conflicts:      coreutils < 8.21
 Conflicts:      sysvinit-tools < 2.88+-87
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-13.1
+# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
+Conflicts:      systemd-presets-branding < 0.4
 # bnc#805684:
 %ifarch s390x
 Obsoletes:      s390-32
@@ -370,6 +372,7 @@ SMP systems.
 %if %build_util_linux
 %package -n python-libmount
 Summary:        %summary_pl
+License:        GPL-2.0+
 Group:          %group_pl
 
 %description -n python-libmount
@@ -730,14 +733,11 @@ mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
 mkdir -p %{buildroot}/run/uuidd
-mkdir -p %{buildroot}/usr/lib/systemd/system-preset
 ln -s %{_bindir}/logger %{buildroot}/bin
 # clock.txt from uuidd is a ghost file
 touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
-# Use socket activated uuidd by default.
-echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset
 %if !%build_util_linux
 %make_install
 %endif
@@ -829,7 +829,6 @@ fi
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
 %{service_add_pre uuidd.socket uuidd.service}
-%{?systemd_preset_pre}
 
 %post -n uuidd
 %{service_add_post uuidd.socket uuidd.service}
@@ -840,8 +839,6 @@ fi
 %postun -n uuidd
 %{service_del_postun uuidd.socket uuidd.service}
 
-%posttrans -p /bin/bash -n uuidd
-%{?systemd_preset_posttrans}
 %endif
 
 %if %build_util_linux
@@ -1274,7 +1271,6 @@ fi
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
 %{_unitdir}/uuidd.socket
-/usr/lib/systemd/system-preset/50-uuidd.preset
 %endif
 
 %if %build_python_libmount
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 967a5df..c887967 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
+
+- presets are managed by the branding presets package (bsc#1012850)
+
+  The default activation state is defined by the branding preset
+  package.
+
+  This also get rid of the only use of the rpm preset macros so we can
+  kill them.
+
 -------------------------------------------------------------------
 Tue Feb  7 20:07:55 CET 2017 - sbrabec@suse.com
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index b7ced87..d79af28 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -173,6 +173,8 @@ Conflicts:      coreutils < 8.21
 Conflicts:      sysvinit-tools < 2.88+-87
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-13.1
+# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
+Conflicts:      systemd-presets-branding < 0.4
 # bnc#805684:
 %ifarch s390x
 Obsoletes:      s390-32
@@ -730,14 +732,11 @@ mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
 mkdir -p %{buildroot}/run/uuidd
-mkdir -p %{buildroot}/usr/lib/systemd/system-preset
 ln -s %{_bindir}/logger %{buildroot}/bin
 # clock.txt from uuidd is a ghost file
 touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
-# Use socket activated uuidd by default.
-echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset
 %if !%build_util_linux
 %make_install
 %endif
@@ -829,7 +828,6 @@ fi
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
 %{service_add_pre uuidd.socket uuidd.service}
-%{?systemd_preset_pre}
 
 %post -n uuidd
 %{service_add_post uuidd.socket uuidd.service}
@@ -840,8 +838,6 @@ fi
 %postun -n uuidd
 %{service_del_postun uuidd.socket uuidd.service}
 
-%posttrans -p /bin/bash -n uuidd
-%{?systemd_preset_posttrans}
 %endif
 
 %if %build_util_linux
@@ -1274,7 +1270,6 @@ fi
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
 %{_unitdir}/uuidd.socket
-/usr/lib/systemd/system-preset/50-uuidd.preset
 %endif
 
 %if %build_python_libmount
diff --git a/util-linux.changes b/util-linux.changes
index 967a5df..c887967 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 10 10:40:23 UTC 2017 - fbui@suse.com
+
+- presets are managed by the branding presets package (bsc#1012850)
+
+  The default activation state is defined by the branding preset
+  package.
+
+  This also get rid of the only use of the rpm preset macros so we can
+  kill them.
+
 -------------------------------------------------------------------
 Tue Feb  7 20:07:55 CET 2017 - sbrabec@suse.com
 
diff --git a/util-linux.spec b/util-linux.spec
index db5a9a6..2180c46 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -173,6 +173,8 @@ Conflicts:      coreutils < 8.21
 Conflicts:      sysvinit-tools < 2.88+-87
 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3).
 Conflicts:      bash-completion <= 2.1-13.1
+# The preset is provided by the presets branding package since 0.4 (bsc#1012850)
+Conflicts:      systemd-presets-branding < 0.4
 # bnc#805684:
 %ifarch s390x
 Obsoletes:      s390-32
@@ -730,14 +732,11 @@ mkdir -p %{buildroot}/bin
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid
 mkdir -p %{buildroot}/run/uuidd
-mkdir -p %{buildroot}/usr/lib/systemd/system-preset
 ln -s %{_bindir}/logger %{buildroot}/bin
 # clock.txt from uuidd is a ghost file
 touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd
 ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim
-# Use socket activated uuidd by default.
-echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset
 %if !%build_util_linux
 %make_install
 %endif
@@ -829,7 +828,6 @@ fi
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
 %{service_add_pre uuidd.socket uuidd.service}
-%{?systemd_preset_pre}
 
 %post -n uuidd
 %{service_add_post uuidd.socket uuidd.service}
@@ -840,8 +838,6 @@ fi
 %postun -n uuidd
 %{service_del_postun uuidd.socket uuidd.service}
 
-%posttrans -p /bin/bash -n uuidd
-%{?systemd_preset_posttrans}
 %endif
 
 %if %build_util_linux
@@ -1274,7 +1270,6 @@ fi
 %{_sbindir}/rcuuidd
 %{_unitdir}/uuidd.service
 %{_unitdir}/uuidd.socket
-/usr/lib/systemd/system-preset/50-uuidd.preset
 %endif
 
 %if %build_python_libmount