sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 455978 from home:fbui:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Dirk Mueller 2017-02-13 12:54:49 +00:00 committed by Git OBS Bridge
parent b385cd6d75
commit 783484c315
6 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python-libmount.changes
View File

@ -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

12
python-libmount.spec
View File

@ -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

11
util-linux-systemd.changes
View File

@ -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

9
util-linux-systemd.spec
View File

@ -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

11
util-linux.changes
View File

@ -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

9
util-linux.spec
View File

@ -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