Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package systemd-presets-common-SUSE for
openSUSE:Factory checked in at 2025-05-27 18:49:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd-presets-common-SUSE (Old)
and /work/SRC/openSUSE:Factory/.systemd-presets-common-SUSE.new.2732 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd-presets-common-SUSE"
Tue May 27 18:49:04 2025 rev:39 rq:1279274 version:15
Changes:
--------
---
/work/SRC/openSUSE:Factory/systemd-presets-common-SUSE/systemd-presets-common-SUSE.changes
2025-03-31 11:39:09.574164563 +0200
+++
/work/SRC/openSUSE:Factory/.systemd-presets-common-SUSE.new.2732/systemd-presets-common-SUSE.changes
2025-05-27 18:49:13.086302484 +0200
@@ -1,0 +2,9 @@
+Mon Apr 28 12:23:41 UTC 2025 - Callum Farmer <gm...@opensuse.org>
+
+- Create devel subpackage:
+ * Add RPM macros file
+ * Package to be used to develop preset packages
+ (distro, display manager etc.)
+- Move specfile scriptlets to the ones in macros.systemd-preset
+
+-------------------------------------------------------------------
New:
----
macros.systemd-preset
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-presets-common-SUSE.spec ++++++
--- /var/tmp/diff_new_pack.0lkSaN/_old 2025-05-27 18:49:13.762330960 +0200
+++ /var/tmp/diff_new_pack.0lkSaN/_new 2025-05-27 18:49:13.766331129 +0200
@@ -15,9 +15,6 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-
-%define generic_name systemd-presets-branding
-
Name: systemd-presets-common-SUSE
Version: 15
Release: 0
@@ -28,6 +25,7 @@
Source2: 99-default-disable.preset
Source3: branding-preset-states
Source4: default-SUSE-user.preset
+Source5: macros.systemd-preset
BuildRequires: pkgconfig(systemd)
#!BuildIgnore: systemd-presets-branding
PreReq: coreutils
@@ -38,9 +36,21 @@
Requires(pre): bash
Requires(post): bash
+%{load:%{SOURCE5}}
+%define generic_name %{__preset_generic_name}
+
%description
Default presets for systemd on SUSE based distributions.
+%package devel
+Summary: Devel package for systemd presets
+Group: System/Base
+Requires: systemd-presets-common-SUSE
+
+%description devel
+This package provides the needed files to build preset
+packages
+
%prep
%setup -q -T -c
@@ -57,41 +67,19 @@
install -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/%{generic_name}/
install -m644 %{SOURCE4}
%{buildroot}%{_prefix}/lib/systemd/user-preset/95-default-SUSE.preset
+install -Dm0644 %{SOURCE5} %{buildroot}%{_rpmmacrodir}/macros.systemd-preset
+
%pre
-# On initial installation, branding-preset-states does not yet exist,
-# which is why we also check for the file to be present/executable
-if [ $1 -gt 1 -a -x %{_prefix}/lib/%{generic_name}/branding-preset-states ] ;
then
- #
- # Save the old state so we can detect which package have its
- # default changed later.
- #
- # Note: the old version of the script is used here.
- #
- %{_prefix}/lib/%{generic_name}/branding-preset-states save
- %{_prefix}/lib/%{generic_name}/branding-preset-states save user
-elif [ $1 -eq 1 ]; then
- touch /run/rpm-%{name}-preset-all
-fi
+%systemd_preset_pre
+%systemd_user_preset_pre
%post
-if [ $1 -gt 1 ] ; then
- #
- # Now that the updated presets are installed, find the ones
- # that have been changed and apply "systemct preset" on them.
- #
- %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes
- %{_prefix}/lib/%{generic_name}/branding-preset-states apply-changes user
-fi
+%systemd_preset_post
+%systemd_user_preset_post
%posttrans
-if [ -f /run/rpm-%{name}-preset-all ]; then
- # Enable all services, which were installed before systemd
- # Don't disable services, since this would disable the
- # complete network stack.
- systemctl preset-all --preset-mode=enable-only
- systemctl preset-all --preset-mode=enable-only --global
-fi
-rm -f /run/rpm-%{name}-preset-all
+%systemd_preset_posttrans
+%systemd_user_preset_posttrans
%files
%defattr(-,root,root)
@@ -99,3 +87,6 @@
%{_prefix}/lib/systemd/system-preset/*
%{_prefix}/lib/systemd/user-preset/*
+%files devel
+%{_rpmmacrodir}/macros.systemd-preset
+
++++++ macros.systemd-preset ++++++
%__preset_generic_name systemd-presets-branding
%systemd_preset_requires \
Requires(pre): systemd-presets-common-SUSE \
Requires(post): systemd-presets-common-SUSE \
Requires(posttrans): systemd-presets-common-SUSE \
%{nil}
%systemd_preset_pre \
# On initial installation, branding-preset-states does not yet exist, \
# which is why we also check for the file to be present/executable \
if [ $1 -gt 1 -a -x
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states ] ; then \
# \
# Save the old state so we can detect which package have its \
# default changed later. \
# \
# Note: the old version of the script is used here. \
# \
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states save \
elif [ $1 -eq 1 ]; then \
touch /run/rpm-%{__preset_generic_name}-preset-system \
fi \
%{nil}
%systemd_user_preset_pre \
# On initial installation, branding-preset-states does not yet exist, \
# which is why we also check for the file to be present/executable \
if [ $1 -gt 1 -a -x
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states ] ; then \
# \
# Save the old state so we can detect which package have its \
# default changed later. \
# \
# Note: the old version of the script is used here. \
# \
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states save
user \
elif [ $1 -eq 1 ]; then \
touch /run/rpm-%{__preset_generic_name}-preset-user \
fi \
%{nil}
%systemd_preset_post \
if [ $1 -gt 1 ] ; then \
# \
# Now that the updated presets are installed, find the ones \
# that have been changed and apply "systemct preset" on them. \
# \
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states
apply-changes \
fi \
%{nil}
%systemd_user_preset_post \
if [ $1 -gt 1 ] ; then \
# \
# Now that the updated presets are installed, find the ones \
# that have been changed and apply "systemct preset" on them. \
# \
%{_prefix}/lib/%{__preset_generic_name}/branding-preset-states
apply-changes user \
fi \
%{nil}
%systemd_preset_posttrans \
if [ -f /run/rpm-%{__preset_generic_name}-preset-system ]; then \
# Enable all services, which were installed before systemd \
# Don't disable services, since this would disable the \
# complete network stack. \
systemctl preset-all --preset-mode=enable-only \
fi \
rm -f /run/rpm-%{__preset_generic_name}-preset-system \
%{nil}
%systemd_user_preset_posttrans \
if [ -f /run/rpm-%{__preset_generic_name}-preset-user ]; then \
# Enable all services, which were installed before systemd \
# Don't disable services, since this would disable the \
# complete network stack. \
systemctl preset-all --preset-mode=enable-only --global \
fi \
rm -f /run/rpm-%{__preset_generic_name}-preset-user \
%{nil}
%systemd_preset_force_post(de) \
if [ "$(systemctl is-enabled %{1})" != "not-found" ]; then \
systemctl preset %{-d:--preset-mode=disable-only}
%{-e:--preset-mode=enable-only} %{1} \
else \
echo "%{1} doesn't exist: doing nothing." \
fi \
%{nil}
%systemd_user_preset_force_post(de) \
if [ "$(systemctl --global is-enabled %{1})" != "not-found" ]; then \
systemctl --global preset %{-d:--preset-mode=disable-only}
%{-e:--preset-mode=enable-only} %{1} \
else \
echo "%{1} doesn't exist: doing nothing." \
fi \
%{nil}
