pool/util-linux
SHA256
2
0
Fork 4
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 390044 from home:rudi_m:branches:Base:System

Browse Source 
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

OBS-URL: https://build.opensuse.org/request/show/390044
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=304
This commit is contained in:
Marcus Meissner 2016-04-24 09:08:55 +00:00 committed by Git OBS Bridge
parent afb635ea16
commit f7f92f04d8
6 changed files with 63 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python-libmount.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

80
python-libmount.spec
View File

@ -16,9 +16,6 @@
# #
%bcond_without sysvinit_tools
%bcond_without enable_su
%bcond_without enable_eject
%bcond_without enable_last %bcond_without enable_last
Name: python-libmount Name: python-libmount
@ -97,14 +94,10 @@ BuildRequires: gpg-offline
%endif %endif
%if %build_util_linux_systemd %if %build_util_linux_systemd
BuildRequires: socat BuildRequires: socat
%if 0%{?suse_version} <= 1230
BuildRequires: pkgconfig(systemd)
%else
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: pkgconfig(libsystemd-journal)
%endif %endif
%endif
%if %build_python_libmount %if %build_python_libmount
BuildRequires: python-devel BuildRequires: python-devel
%endif %endif
@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
%endif
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%endif
%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 Conflicts: sysvinit-tools < 2.88+-87
%endif
# bnc#805684: # bnc#805684:
%ifarch s390x %ifarch s390x
Obsoletes: s390-32 Obsoletes: s390-32
@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--with-audit \ --with-audit \
@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \ --with-bashcompletiondir=%{_datadir}/bash-completion \
--enable-all-programs \ --with-systemdsystemunitdir=%{_unitdir} \
--disable-reset \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \
--disable-use-tty-group \ --disable-use-tty-group \
--disable-silent-rules \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--enable-all-programs \
--disable-reset \
%if %{without enable_last} %if %{without enable_last}
--disable-last \ --disable-last \
%endif %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 %if %build_util_linux_systemd
--with-systemd \
--enable-logger \ --enable-logger \
--enable-lslogins \ --enable-lslogins \
--enable-uuidd \ --enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else %else
--without-systemd \
--disable-logger \ --disable-logger \
--disable-lslogins \ --disable-lslogins \
--disable-uuidd \ --disable-uuidd \
--without-systemd \
%endif %endif
%if %build_python_libmount %if %build_python_libmount
--with-python \ --with-python \
%else %else
--without-python \ --without-python \
%endif %endif
--enable-libmount-force-mountinfo \
# #
# Safety check: HAVE_UUIDD should be always 1: # Safety check: HAVE_UUIDD should be always 1:
@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote 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
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l 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
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole pushd ../klogconsole
# klogconsole install # klogconsole install
@ -655,10 +626,8 @@ popd
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux %if %build_util_linux
#UsrMerge #UsrMerge
%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin
%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin
@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system
%post %post
%{fillup_and_insserv raw} %{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
%if %{with enable_su}
%set_permissions %{_bindir}/su %set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux # Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12) # (openSUSE 12.3->13.1, SLE11->SLE12)
@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi fi
done done
%endif
# mount option 'code=' is now called 'codepage=' so change fstab # mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then if [ -f etc/fstab ]; then
@ -829,9 +796,7 @@ fi
%verifyscript %verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
%if %{with enable_su}
%verify_permissions -e %{_bindir}/su %verify_permissions -e %{_bindir}/su
%endif
%post -n libblkid1 -p /sbin/ldconfig %post -n libblkid1 -p /sbin/ldconfig
@ -857,9 +822,8 @@ fi
%endif %endif
%if %build_util_linux_systemd %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). # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
# If only util-linux is updated, restart of fstrim service does not happen. # service (timer), no restart needed on binary updates (unless path is changed).
# Maybe we should move fstrim to util-linux-systemd in the next version.
%pre -n util-linux-systemd %pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer} %{service_add_pre fstrim.service fstrim.timer}
@ -877,7 +841,7 @@ fi
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || : -d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service} %{service_add_pre uuidd.socket uuidd.service}
%systemd_preset_pre %{?systemd_preset_pre}
%post -n uuidd %post -n uuidd
%{service_add_post uuidd.socket uuidd.service} %{service_add_post uuidd.socket uuidd.service}
@ -889,7 +853,7 @@ fi
%{service_del_postun uuidd.socket uuidd.service} %{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd %posttrans -p /bin/bash -n uuidd
%systemd_preset_posttrans %{?systemd_preset_posttrans}
%endif %endif
%if %build_util_linux %if %build_util_linux
@ -920,16 +884,12 @@ fi
%config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su %config(noreplace) %{_sysconfdir}/default/su
%endif
#UsrMerge #UsrMerge
%if %{with enable_su}
/bin/kill /bin/kill
/bin/su /bin/su
%endif
/bin/dmesg /bin/dmesg
/bin/more /bin/more
/bin/mount /bin/mount
@ -963,13 +923,9 @@ fi
/sbin/fstrim /sbin/fstrim
/sbin/chcpu /sbin/chcpu
#EndUsrMerge #EndUsrMerge
%if %{with enable_su}
%{_bindir}/kill %{_bindir}/kill
%{_bindir}/su %{_bindir}/su
%endif
%if %{with enable_eject}
%{_bindir}/eject %{_bindir}/eject
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col
@ -1018,10 +974,8 @@ fi
%{_bindir}/ul %{_bindir}/ul
%{_bindir}/umount %{_bindir}/umount
%{_bindir}/unshare %{_bindir}/unshare
%if %{with sysvinit_tools}
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%endif
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
@ -1059,9 +1013,7 @@ fi
%{_sbindir}/rtcwake %{_sbindir}/rtcwake
%{_sbindir}/runuser %{_sbindir}/runuser
%{_sbindir}/setctsid %{_sbindir}/setctsid
%if %{with sysvinit_tools}
%{_sbindir}/sulogin %{_sbindir}/sulogin
%endif
%{_sbindir}/swaplabel %{_sbindir}/swaplabel
%{_sbindir}/swapoff %{_sbindir}/swapoff
%{_sbindir}/swapon %{_sbindir}/swapon
@ -1071,10 +1023,8 @@ fi
%{_bindir}/whereis %{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write %verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl %{_sbindir}/zramctl
%if %{with enable_su}
%{_mandir}/man1/kill.1.gz %{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz %{_mandir}/man1/su.1.gz
%endif
%{_mandir}/man1/cal.1.gz %{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz %{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz %{_mandir}/man1/col.1.gz
@ -1082,9 +1032,7 @@ fi
%{_mandir}/man1/colrm.1.gz %{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz %{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz %{_mandir}/man1/dmesg.1.gz
%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz %{_mandir}/man1/eject.1.gz
%endif
%{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz %{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz %{_mandir}/man1/getopt.1.gz
@ -1123,10 +1071,8 @@ fi
%{_mandir}/man1/whereis.1.gz %{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz %{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz %{_mandir}/man1/ipcmk.1.gz
%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%endif
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
@ -1178,9 +1124,7 @@ fi
%{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz %{_mandir}/man8/resizepart.8.gz
%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz %{_mandir}/man8/sulogin.8.gz
%endif
%{_mandir}/man8/wdctl.8.gz %{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb %{_sbindir}/flushb
%{_sbindir}/readprofile %{_sbindir}/readprofile

9
util-linux-systemd.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

80
util-linux-systemd.spec
View File

@ -16,9 +16,6 @@
# #
%bcond_without sysvinit_tools
%bcond_without enable_su
%bcond_without enable_eject
%bcond_without enable_last %bcond_without enable_last
Name: util-linux-systemd Name: util-linux-systemd
@ -97,14 +94,10 @@ BuildRequires: gpg-offline
%endif %endif
%if %build_util_linux_systemd %if %build_util_linux_systemd
BuildRequires: socat BuildRequires: socat
%if 0%{?suse_version} <= 1230
BuildRequires: pkgconfig(systemd)
%else
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: pkgconfig(libsystemd-journal)
%endif %endif
%endif
%if %build_python_libmount %if %build_python_libmount
BuildRequires: python-devel BuildRequires: python-devel
%endif %endif
@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
%endif
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%endif
%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 Conflicts: sysvinit-tools < 2.88+-87
%endif
# bnc#805684: # bnc#805684:
%ifarch s390x %ifarch s390x
Obsoletes: s390-32 Obsoletes: s390-32
@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--with-audit \ --with-audit \
@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \ --with-bashcompletiondir=%{_datadir}/bash-completion \
--enable-all-programs \ --with-systemdsystemunitdir=%{_unitdir} \
--disable-reset \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \
--disable-use-tty-group \ --disable-use-tty-group \
--disable-silent-rules \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--enable-all-programs \
--disable-reset \
%if %{without enable_last} %if %{without enable_last}
--disable-last \ --disable-last \
%endif %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 %if %build_util_linux_systemd
--with-systemd \
--enable-logger \ --enable-logger \
--enable-lslogins \ --enable-lslogins \
--enable-uuidd \ --enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else %else
--without-systemd \
--disable-logger \ --disable-logger \
--disable-lslogins \ --disable-lslogins \
--disable-uuidd \ --disable-uuidd \
--without-systemd \
%endif %endif
%if %build_python_libmount %if %build_python_libmount
--with-python \ --with-python \
%else %else
--without-python \ --without-python \
%endif %endif
--enable-libmount-force-mountinfo \
# #
# Safety check: HAVE_UUIDD should be always 1: # Safety check: HAVE_UUIDD should be always 1:
@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote 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
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l 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
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole pushd ../klogconsole
# klogconsole install # klogconsole install
@ -655,10 +626,8 @@ popd
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux %if %build_util_linux
#UsrMerge #UsrMerge
%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin
%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin
@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system
%post %post
%{fillup_and_insserv raw} %{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
%if %{with enable_su}
%set_permissions %{_bindir}/su %set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux # Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12) # (openSUSE 12.3->13.1, SLE11->SLE12)
@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi fi
done done
%endif
# mount option 'code=' is now called 'codepage=' so change fstab # mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then if [ -f etc/fstab ]; then
@ -829,9 +796,7 @@ fi
%verifyscript %verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
%if %{with enable_su}
%verify_permissions -e %{_bindir}/su %verify_permissions -e %{_bindir}/su
%endif
%post -n libblkid1 -p /sbin/ldconfig %post -n libblkid1 -p /sbin/ldconfig
@ -857,9 +822,8 @@ fi
%endif %endif
%if %build_util_linux_systemd %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). # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
# If only util-linux is updated, restart of fstrim service does not happen. # service (timer), no restart needed on binary updates (unless path is changed).
# Maybe we should move fstrim to util-linux-systemd in the next version.
%pre -n util-linux-systemd %pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer} %{service_add_pre fstrim.service fstrim.timer}
@ -877,7 +841,7 @@ fi
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || : -d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service} %{service_add_pre uuidd.socket uuidd.service}
%systemd_preset_pre %{?systemd_preset_pre}
%post -n uuidd %post -n uuidd
%{service_add_post uuidd.socket uuidd.service} %{service_add_post uuidd.socket uuidd.service}
@ -889,7 +853,7 @@ fi
%{service_del_postun uuidd.socket uuidd.service} %{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd %posttrans -p /bin/bash -n uuidd
%systemd_preset_posttrans %{?systemd_preset_posttrans}
%endif %endif
%if %build_util_linux %if %build_util_linux
@ -920,16 +884,12 @@ fi
%config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su %config(noreplace) %{_sysconfdir}/default/su
%endif
#UsrMerge #UsrMerge
%if %{with enable_su}
/bin/kill /bin/kill
/bin/su /bin/su
%endif
/bin/dmesg /bin/dmesg
/bin/more /bin/more
/bin/mount /bin/mount
@ -963,13 +923,9 @@ fi
/sbin/fstrim /sbin/fstrim
/sbin/chcpu /sbin/chcpu
#EndUsrMerge #EndUsrMerge
%if %{with enable_su}
%{_bindir}/kill %{_bindir}/kill
%{_bindir}/su %{_bindir}/su
%endif
%if %{with enable_eject}
%{_bindir}/eject %{_bindir}/eject
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col
@ -1018,10 +974,8 @@ fi
%{_bindir}/ul %{_bindir}/ul
%{_bindir}/umount %{_bindir}/umount
%{_bindir}/unshare %{_bindir}/unshare
%if %{with sysvinit_tools}
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%endif
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
@ -1059,9 +1013,7 @@ fi
%{_sbindir}/rtcwake %{_sbindir}/rtcwake
%{_sbindir}/runuser %{_sbindir}/runuser
%{_sbindir}/setctsid %{_sbindir}/setctsid
%if %{with sysvinit_tools}
%{_sbindir}/sulogin %{_sbindir}/sulogin
%endif
%{_sbindir}/swaplabel %{_sbindir}/swaplabel
%{_sbindir}/swapoff %{_sbindir}/swapoff
%{_sbindir}/swapon %{_sbindir}/swapon
@ -1071,10 +1023,8 @@ fi
%{_bindir}/whereis %{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write %verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl %{_sbindir}/zramctl
%if %{with enable_su}
%{_mandir}/man1/kill.1.gz %{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz %{_mandir}/man1/su.1.gz
%endif
%{_mandir}/man1/cal.1.gz %{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz %{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz %{_mandir}/man1/col.1.gz
@ -1082,9 +1032,7 @@ fi
%{_mandir}/man1/colrm.1.gz %{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz %{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz %{_mandir}/man1/dmesg.1.gz
%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz %{_mandir}/man1/eject.1.gz
%endif
%{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz %{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz %{_mandir}/man1/getopt.1.gz
@ -1123,10 +1071,8 @@ fi
%{_mandir}/man1/whereis.1.gz %{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz %{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz %{_mandir}/man1/ipcmk.1.gz
%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%endif
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
@ -1178,9 +1124,7 @@ fi
%{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz %{_mandir}/man8/resizepart.8.gz
%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz %{_mandir}/man8/sulogin.8.gz
%endif
%{_mandir}/man8/wdctl.8.gz %{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb %{_sbindir}/flushb
%{_sbindir}/readprofile %{_sbindir}/readprofile

9
util-linux.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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 Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de

80
util-linux.spec
View File

@ -16,9 +16,6 @@
# #
%bcond_without sysvinit_tools
%bcond_without enable_su
%bcond_without enable_eject
%bcond_without enable_last %bcond_without enable_last
Name: util-linux Name: util-linux
@ -97,14 +94,10 @@ BuildRequires: gpg-offline
%endif %endif
%if %build_util_linux_systemd %if %build_util_linux_systemd
BuildRequires: socat BuildRequires: socat
%if 0%{?suse_version} <= 1230
BuildRequires: pkgconfig(systemd)
%else
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-daemon)
BuildRequires: pkgconfig(libsystemd-journal) BuildRequires: pkgconfig(libsystemd-journal)
%endif %endif
%endif
%if %build_python_libmount %if %build_python_libmount
BuildRequires: python-devel BuildRequires: python-devel
%endif %endif
@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif
Provides: login = 4.0-33.7 Provides: login = 4.0-33.7
%if %{with enable_eject}
# File conflict of eject (up to 12.3 and SLE11). # File conflict of eject (up to 12.3 and SLE11).
Obsoletes: eject < 2.1.0-166.8 Obsoletes: eject < 2.1.0-166.8
%endif
# File conflict of login (up to 12.1 and SLE11). # File conflict of login (up to 12.1 and SLE11).
Obsoletes: login < 4.0-33.7 Obsoletes: login < 4.0-33.7
%if %{with enable_su}
# File conflict of su and kill (up to 12.3 and SLE11). # 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. # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol.
Conflicts: coreutils < 8.21 Conflicts: coreutils < 8.21
%endif
%if %{with sysvinit_tools}
# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). # File conflict of sulogin and utmpdump (up to 12.3 and SLE11).
Conflicts: sysvinit-tools < 2.88+-87 Conflicts: sysvinit-tools < 2.88+-87
%endif
# bnc#805684: # bnc#805684:
%ifarch s390x %ifarch s390x
Obsoletes: s390-32 Obsoletes: s390-32
@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities.
AUTOPOINT=true autoreconf -vfi AUTOPOINT=true autoreconf -vfi
%configure \ %configure \
--disable-silent-rules \
--localstatedir=/run \ --localstatedir=/run \
--docdir=%{_docdir}/%{_name} \ --docdir=%{_docdir}/%{_name} \
--with-audit \ --with-audit \
@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi
--with-selinux \ --with-selinux \
$uhead \ $uhead \
--with-bashcompletiondir=%{_datadir}/bash-completion \ --with-bashcompletiondir=%{_datadir}/bash-completion \
--enable-all-programs \ --with-systemdsystemunitdir=%{_unitdir} \
--disable-reset \ --enable-libmount-force-mountinfo \
--enable-sulogin-emergency-mount \
--disable-use-tty-group \ --disable-use-tty-group \
--disable-silent-rules \
--enable-static \ --enable-static \
--disable-rpath \ --disable-rpath \
--enable-all-programs \
--disable-reset \
%if %{without enable_last} %if %{without enable_last}
--disable-last \ --disable-last \
%endif %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 %if %build_util_linux_systemd
--with-systemd \
--enable-logger \ --enable-logger \
--enable-lslogins \ --enable-lslogins \
--enable-uuidd \ --enable-uuidd \
--with-systemd \
--with-systemdsystemunitdir=%{_unitdir} \
%else %else
--without-systemd \
--disable-logger \ --disable-logger \
--disable-lslogins \ --disable-lslogins \
--disable-uuidd \ --disable-uuidd \
--without-systemd \
%endif %endif
%if %build_python_libmount %if %build_python_libmount
--with-python \ --with-python \
%else %else
--without-python \ --without-python \
%endif %endif
--enable-libmount-force-mountinfo \
# #
# Safety check: HAVE_UUIDD should be always 1: # Safety check: HAVE_UUIDD should be always 1:
@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login
install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote 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
install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l 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
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
%endif
mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
pushd ../klogconsole pushd ../klogconsole
# klogconsole install # klogconsole install
@ -655,10 +626,8 @@ popd
rm -f %{buildroot}%{python_sitearch}/libmount/*.*a rm -f %{buildroot}%{python_sitearch}/libmount/*.*a
%if %build_util_linux %if %build_util_linux
#UsrMerge #UsrMerge
%if %{with enable_su}
ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/kill %{buildroot}/bin
ln -s %{_bindir}/su %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin
%endif
ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/dmesg %{buildroot}/bin
ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin
ln -s %{_bindir}/mount %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin
@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system
%post %post
%{fillup_and_insserv raw} %{fillup_and_insserv raw}
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
%if %{with enable_su}
%set_permissions %{_bindir}/su %set_permissions %{_bindir}/su
# Safely migrate PAM files from coreutils to util-linux # Safely migrate PAM files from coreutils to util-linux
# (openSUSE 12.3->13.1, SLE11->SLE12) # (openSUSE 12.3->13.1, SLE11->SLE12)
@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do
mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE
fi fi
done done
%endif
# mount option 'code=' is now called 'codepage=' so change fstab # mount option 'code=' is now called 'codepage=' so change fstab
if [ -f etc/fstab ]; then if [ -f etc/fstab ]; then
@ -829,9 +796,7 @@ fi
%verifyscript %verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
%if %{with enable_su}
%verify_permissions -e %{_bindir}/su %verify_permissions -e %{_bindir}/su
%endif
%post -n libblkid1 -p /sbin/ldconfig %post -n libblkid1 -p /sbin/ldconfig
@ -857,9 +822,8 @@ fi
%endif %endif
%if %build_util_linux_systemd %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). # fstrim(8) and fstrim.service are from different packages. But it's a oneshot
# If only util-linux is updated, restart of fstrim service does not happen. # service (timer), no restart needed on binary updates (unless path is changed).
# Maybe we should move fstrim to util-linux-systemd in the next version.
%pre -n util-linux-systemd %pre -n util-linux-systemd
%{service_add_pre fstrim.service fstrim.timer} %{service_add_pre fstrim.service fstrim.timer}
@ -877,7 +841,7 @@ fi
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
-d /var/run/uuidd uuidd 2>/dev/null || : -d /var/run/uuidd uuidd 2>/dev/null || :
%{service_add_pre uuidd.socket uuidd.service} %{service_add_pre uuidd.socket uuidd.service}
%systemd_preset_pre %{?systemd_preset_pre}
%post -n uuidd %post -n uuidd
%{service_add_post uuidd.socket uuidd.service} %{service_add_post uuidd.socket uuidd.service}
@ -889,7 +853,7 @@ fi
%{service_del_postun uuidd.socket uuidd.service} %{service_del_postun uuidd.socket uuidd.service}
%posttrans -p /bin/bash -n uuidd %posttrans -p /bin/bash -n uuidd
%systemd_preset_posttrans %{?systemd_preset_posttrans}
%endif %endif
%if %build_util_linux %if %build_util_linux
@ -920,16 +884,12 @@ fi
%config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/remote
%config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser
%config(noreplace) %{_sysconfdir}/pam.d/runuser-l %config(noreplace) %{_sysconfdir}/pam.d/runuser-l
%if %{with enable_su}
%config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su
%config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/pam.d/su-l
%config(noreplace) %{_sysconfdir}/default/su %config(noreplace) %{_sysconfdir}/default/su
%endif
#UsrMerge #UsrMerge
%if %{with enable_su}
/bin/kill /bin/kill
/bin/su /bin/su
%endif
/bin/dmesg /bin/dmesg
/bin/more /bin/more
/bin/mount /bin/mount
@ -963,13 +923,9 @@ fi
/sbin/fstrim /sbin/fstrim
/sbin/chcpu /sbin/chcpu
#EndUsrMerge #EndUsrMerge
%if %{with enable_su}
%{_bindir}/kill %{_bindir}/kill
%{_bindir}/su %{_bindir}/su
%endif
%if %{with enable_eject}
%{_bindir}/eject %{_bindir}/eject
%endif
%{_bindir}/cal %{_bindir}/cal
%{_bindir}/chrt %{_bindir}/chrt
%{_bindir}/col %{_bindir}/col
@ -1018,10 +974,8 @@ fi
%{_bindir}/ul %{_bindir}/ul
%{_bindir}/umount %{_bindir}/umount
%{_bindir}/unshare %{_bindir}/unshare
%if %{with sysvinit_tools}
%{_bindir}/mountpoint %{_bindir}/mountpoint
%{_bindir}/utmpdump %{_bindir}/utmpdump
%endif
%{_bindir}/uuidgen %{_bindir}/uuidgen
%{_bindir}/uname26 %{_bindir}/uname26
%ifnarch ppc ppc64 %ifnarch ppc ppc64
@ -1059,9 +1013,7 @@ fi
%{_sbindir}/rtcwake %{_sbindir}/rtcwake
%{_sbindir}/runuser %{_sbindir}/runuser
%{_sbindir}/setctsid %{_sbindir}/setctsid
%if %{with sysvinit_tools}
%{_sbindir}/sulogin %{_sbindir}/sulogin
%endif
%{_sbindir}/swaplabel %{_sbindir}/swaplabel
%{_sbindir}/swapoff %{_sbindir}/swapoff
%{_sbindir}/swapon %{_sbindir}/swapon
@ -1071,10 +1023,8 @@ fi
%{_bindir}/whereis %{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write %verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl %{_sbindir}/zramctl
%if %{with enable_su}
%{_mandir}/man1/kill.1.gz %{_mandir}/man1/kill.1.gz
%{_mandir}/man1/su.1.gz %{_mandir}/man1/su.1.gz
%endif
%{_mandir}/man1/cal.1.gz %{_mandir}/man1/cal.1.gz
%{_mandir}/man1/chrt.1.gz %{_mandir}/man1/chrt.1.gz
%{_mandir}/man1/col.1.gz %{_mandir}/man1/col.1.gz
@ -1082,9 +1032,7 @@ fi
%{_mandir}/man1/colrm.1.gz %{_mandir}/man1/colrm.1.gz
%{_mandir}/man1/column.1.gz %{_mandir}/man1/column.1.gz
%{_mandir}/man1/dmesg.1.gz %{_mandir}/man1/dmesg.1.gz
%if %{with enable_eject}
%{_mandir}/man1/eject.1.gz %{_mandir}/man1/eject.1.gz
%endif
%{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/fallocate.1.gz
%{_mandir}/man1/flock.1.gz %{_mandir}/man1/flock.1.gz
%{_mandir}/man1/getopt.1.gz %{_mandir}/man1/getopt.1.gz
@ -1123,10 +1071,8 @@ fi
%{_mandir}/man1/whereis.1.gz %{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz %{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz %{_mandir}/man1/ipcmk.1.gz
%if %{with sysvinit_tools}
%{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/utmpdump.1.gz
%endif
%{_mandir}/man1/runuser.1.gz %{_mandir}/man1/runuser.1.gz
%{_mandir}/man1/uuidgen.1.gz %{_mandir}/man1/uuidgen.1.gz
%{_mandir}/man5/fstab.5.gz %{_mandir}/man5/fstab.5.gz
@ -1178,9 +1124,7 @@ fi
%{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/fstrim.8.gz
%{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/lsblk.8.gz
%{_mandir}/man8/resizepart.8.gz %{_mandir}/man8/resizepart.8.gz
%if %{with sysvinit_tools}
%{_mandir}/man8/sulogin.8.gz %{_mandir}/man8/sulogin.8.gz
%endif
%{_mandir}/man8/wdctl.8.gz %{_mandir}/man8/wdctl.8.gz
%{_sbindir}/flushb %{_sbindir}/flushb
%{_sbindir}/readprofile %{_sbindir}/readprofile