Just a minor cosmetical cleanup which should not change anything
for the Factory build.

Changes:
- fix build for openSUSE >= 13.1 (inclusive SLE 12)
- drop build for openSUSE < 13.1
- remove old build conditions: sysvinit_tools, enable_su and
enable_eject
- cosmetics: reorder configure options

old: Base:System/util-linux
new: home:rudi_m:branches:Base:System/util-linux rev None
Index: python-libmount.changes
===================================================================
--- python-libmount.changes (revision 302)
+++ python-libmount.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

- Update to version 2.28:
Index: python-libmount.spec
===================================================================
--- python-libmount.spec (revision 302)
+++ python-libmount.spec (revision 13)
@@ -16,9 +16,6 @@
#


-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last

Name: python-libmount
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \

#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif

# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@

%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif

%post -n libblkid1 -p /sbin/ldconfig

@@ -857,9 +822,8 @@
%endif

%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}

@@ -877,7 +841,7 @@
/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
+%{?systemd_preset_pre}

%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}

%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif

%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
Index: util-linux-systemd.changes
===================================================================
--- util-linux-systemd.changes (revision 302)
+++ util-linux-systemd.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

- Update to version 2.28:
Index: util-linux-systemd.spec
===================================================================
--- util-linux-systemd.spec (revision 302)
+++ util-linux-systemd.spec (revision 13)
@@ -16,9 +16,6 @@
#


-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last

Name: util-linux-systemd
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \

#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif

# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@

%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif

%post -n libblkid1 -p /sbin/ldconfig

@@ -857,9 +822,8 @@
%endif

%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}

@@ -877,7 +841,7 @@
/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
+%{?systemd_preset_pre}

%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}

%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif

%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile
Index: util-linux.changes
===================================================================
--- util-linux.changes (revision 302)
+++ util-linux.changes (revision 13)
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de
+
+- fix build for openSUSE >= 13.1 (inclusive SLE 12)
+- drop build for openSUSE < 13.1
+- remove old build conditions: sysvinit_tools, enable_su and
+ enable_eject
+- cosmetics: reorder configure options
+
+-------------------------------------------------------------------
Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

- Update to version 2.28:
Index: util-linux.spec
===================================================================
--- util-linux.spec (revision 302)
+++ util-linux.spec (revision 13)
@@ -16,9 +16,6 @@
#


-%bcond_without sysvinit_tools
-%bcond_without enable_su
-%bcond_without enable_eject
%bcond_without enable_last

Name: util-linux
@@ -97,14 +94,10 @@
%endif
%if %build_util_linux_systemd
BuildRequires: socat
-%if 0%{?suse_version} <= 1230
-BuildRequires: pkgconfig(systemd)
-%else
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal)
%endif
-%endif
%if %build_python_libmount
BuildRequires: python-devel
%endif
@@ -170,25 +163,17 @@
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
-%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
-%endif
Provides: login = 4.0-33.7
-%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8
-%endif
# File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7
-%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11).
# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21
-%endif
-%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87
-%endif
# bnc#805684:
%ifarch s390x
Obsoletes: s390-32
@@ -538,6 +523,7 @@
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi
%configure \
+ --disable-silent-rules \
--localstatedir=/run \
--docdir=%{_docdir}/%{_name} \
--with-audit \
@@ -546,46 +532,33 @@
--with-selinux \
$uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \
- --enable-all-programs \
- --disable-reset \
+ --with-systemdsystemunitdir=%{_unitdir} \
+ --enable-libmount-force-mountinfo \
+ --enable-sulogin-emergency-mount \
--disable-use-tty-group \
- --disable-silent-rules \
--enable-static \
--disable-rpath \
+ --enable-all-programs \
+ --disable-reset \
%if %{without enable_last}
--disable-last \
%endif
-%if %{without enable_eject}
- --disable-eject \
-%endif
-%if %{with sysvinit_tools}
- --enable-sulogin-emergency-mount \
-%else
- --disable-sulogin \
- --disable-mountpoint \
-%endif
-%if %{without enable_su}
- --disable-su \
- --disable-kill \
-%endif
%if %build_util_linux_systemd
+ --with-systemd \
--enable-logger \
--enable-lslogins \
--enable-uuidd \
- --with-systemd \
- --with-systemdsystemunitdir=%{_unitdir} \
%else
+ --without-systemd \
--disable-logger \
--disable-lslogins \
--disable-uuidd \
- --without-systemd \
%endif
%if %build_python_libmount
--with-python \
%else
--without-python \
%endif
- --enable-libmount-force-mountinfo \

#
# Safety check: HAVE_UUIDD should be always 1:
@@ -637,11 +610,9 @@
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole
# klogconsole install
@@ -655,10 +626,8 @@
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux
#UsrMerge
-%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin
-%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin
@@ -798,7 +767,6 @@
%post
%{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
-%if %{with enable_su}
%set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12)
@@ -817,7 +785,6 @@
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi
done
-%endif

# mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then
@@ -829,9 +796,7 @@

%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
-%if %{with enable_su}
%verify_permissions -e %{_bindir}/su
-%endif

%post -n libblkid1 -p /sbin/ldconfig

@@ -857,9 +822,8 @@
%endif

%if %build_util_linux_systemd
-# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons).
-# If only util-linux is updated, restart of fstrim service does not happen.
-# Maybe we should move fstrim to util-linux-systemd in the next version.
+# fstrim(8) and fstrim.service are from different packages. But it's a oneshot
+# service (timer), no restart needed on binary updates (unless path is changed).
%pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer}

@@ -877,7 +841,7 @@
/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
+%{?systemd_preset_pre}

%post -n uuidd
%{service_add_post uuidd.socket uuidd.service}
@@ -889,7 +853,7 @@
%{service_del_postun uuidd.socket uuidd.service}

%posttrans -p /bin/bash -n uuidd
-%systemd_preset_posttrans
+%{?systemd_preset_posttrans}
%endif

%if %build_util_linux
@@ -920,16 +884,12 @@
%config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
-%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su
-%endif
#UsrMerge
-%if %{with enable_su}
/bin/kill
/bin/su
-%endif
/bin/dmesg
/bin/more
/bin/mount
@@ -963,13 +923,9 @@
/sbin/fstrim
/sbin/chcpu
#EndUsrMerge
-%if %{with enable_su}
%{_bindir}/kill
%{_bindir}/su
-%endif
-%if %{with enable_eject}
%{_bindir}/eject
-%endif
%{_bindir}/cal
%{_bindir}/chrt
%{_bindir}/col
@@ -1018,10 +974,8 @@
%{_bindir}/ul
%{_bindir}/umount
%{_bindir}/unshare
-%if %{with sysvinit_tools}
%{_bindir}/mountpoint
%{_bindir}/utmpdump
-%endif
%{_bindir}/uuidgen
%{_bindir}/uname26
%ifnarch ppc ppc64
@@ -1059,9 +1013,7 @@
%{_sbindir}/rtcwake
%{_sbindir}/runuser
%{_sbindir}/setctsid
-%if %{with sysvinit_tools}
%{_sbindir}/sulogin
-%endif
%{_sbindir}/swaplabel
%{_sbindir}/swapoff
%{_sbindir}/swapon
@@ -1071,10 +1023,8 @@
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
-%if %{with enable_su}
%{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz
-%endif
%{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz
@@ -1082,9 +1032,7 @@
%{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz
-%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz
-%endif
%{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz
@@ -1123,10 +1071,8 @@
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
-%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz
-%endif
%{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz
@@ -1178,9 +1124,7 @@
%{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz
-%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz
-%endif
%{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb
%{_sbindir}/readprofile