LogoopenSUSE Build Service > Projects > Base:System > util-linux > Revisions
Sign Up | Log In

Revision Log of util-linux (306)

Ruediger Meier Ruediger Meier (rudi_m) accepted request 393319 about 3 hours ago (revision 306)
- Add librtas-devel to BuildRequires on Power platforms. Needed for
  proper function of lscpu (bsc#975082).
Also add Conflicts to bash-completion change.
Dirk Mueller Dirk Mueller (dirkmueller) accepted request 391743 6 days ago (revision 305)
- Remove incorrect --with-bashcompletiondir that breaks
  bash-completion, use path in bash-completion.pc instead
  (boo#977259).
Marcus Meissner Marcus Meissner (msmeissn) accepted request 390044 9 days ago (revision 304)
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
buildservice-autocommit accepted request 389567 15 days ago (revision 303)
baserev update by copy to link target
Stanislav Brabec Stanislav Brabec (sbrabec) accepted request 389157 19 days ago (revision 302)
- Update to version 2.28:
  * Many changes and improvements, most notably ...
  * Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch
buildservice-autocommit accepted request 347194 5 months ago (revision 301)
baserev update by copy to link target
Marcus Meissner Marcus Meissner (msmeissn) accepted request 346995 5 months ago (revision 300)
- enable last binary
buildservice-autocommit accepted request 345050 5 months ago (revision 299)
baserev update by copy to link target
Marcus Meissner Marcus Meissner (msmeissn) accepted request 344239 6 months ago (revision 298)
- Update to version 2.27.1, bugfix release, see
  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes
Ruediger Meier Ruediger Meier (rudi_m) accepted request 343844 6 months ago (revision 297)
- Change condition for known fail markers from test for armv6 and aarch64
  architecture to test for qemu user-space build
buildservice-autocommit accepted request 341342 6 months ago (revision 296)
baserev update by copy to link target
Stanislav Brabec Stanislav Brabec (sbrabec) committed 6 months ago (revision 295)
Add changes line for the new bug.
buildservice-autocommit accepted request 334018 7 months ago (revision 294)
baserev update by copy to link target
Marcus Meissner Marcus Meissner (msmeissn) accepted request 333182 7 months ago (revision 293)
- Update to version 2.27:
  * Many changes and improvements, most notably:
    * lsipc: new command
    * unshare provides a new option --propagation=
    * mount(8) supports read-only binds in one (not atomic) step by
      "bind,ro".
    * GNU readline support in fdisk and sfdisk.
    * JSON support in libsmartcols and findmnt, losetup, lsblk,
      lslocks, sfdisk and lsipc.
    * script has been massively improved to be more robust and less
      complex (bsc#888678, bsc#930236).
    * sulogin supports locked root accounts by --force.
    * colors support by default. It is possible to change this
      with --disable-colors-default.
    * more information in cfdisk
    * fdisk provides new commands 'F' and 'i'
    * cal supports the new options --twelve and --months <n>
    * rtcwake supports a news option --list-modes and --date, no
      support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
  * Many fixes, most notably:
    * fsck: now supports -r {fd} (bsc#903738)
    * better handling of multi-path devices
      (bsc#880468, bsc#924994)
    * flock: improve timeout handling (bsc#926945)
    * lsblk: display mountpoint even for top-level device
      (bsc#943415)
Stanislav Brabec Stanislav Brabec (sbrabec) accepted request 324668 8 months ago (revision 292)
- Add licenses.
Marcus Meissner Marcus Meissner (msmeissn) accepted request 321271 9 months ago (revision 291)
Submit to Factory depends on request 320740.
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
  do one shot presetting of uuidd.service on upgrade.
  (bnc#900935#c46, FATE#318949).
- Remove one shot presetting hacks.
Dr. Werner Fink Dr. Werner Fink (WernerFink) committed 10 months ago (revision 290)
.
buildservice-autocommit accepted request 312146 10 months ago (revision 289)
baserev update by copy to link target
Stanislav Brabec Stanislav Brabec (sbrabec) committed 11 months ago (revision 288)
Fix characters broken on UTF-8 conversion of changes file.
buildservice-autocommit accepted request 309343 11 months ago (revision 287)
baserev update by copy to link target

Show all