Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2018-01-26 13:33:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux" Fri Jan 26 13:33:44 2018 rev:224 rq:568562 version:2.31 Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2017-12-29 18:46:38.226520805 +0100 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2018-01-26 13:33:45.661376327 +0100 @@ -1,0 +2,30 @@ +Sun Jan 21 20:15:00 UTC 2018 - [email protected] + +- Combine %service_* calls again. + +------------------------------------------------------------------- +Thu Jan 18 01:54:42 UTC 2018 - [email protected] + +- Provide /usr/sbin/rfkill from rfkill package (boo#1076134) + +------------------------------------------------------------------- +Tue Jan 16 16:26:48 UTC 2018 - [email protected] + +- Add util_linux_bigendian.patch solve two failing tests on ppc64 + (sha1, uuid/oids) + +------------------------------------------------------------------- +Fri Jan 12 13:49:36 CET 2018 - [email protected] + +- Integrate [email protected] and [email protected] from + rfkill package (boo#1074250#c4). +- Remove unneeded release based conflicts and obsolescences + (boo#1074250#c18). +- Remove sysvinit requirement. + +------------------------------------------------------------------- +Mon Jan 1 10:32:51 UTC 2018 - [email protected] + +- Fix Obsoletes for rfkill (boo#1074250). + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change New: ---- [email protected] [email protected] util_linux_bigendian.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.FQkrPR/_old 2018-01-26 13:33:47.937270022 +0100 +++ /var/tmp/diff_new_pack.FQkrPR/_new 2018-01-26 13:33:47.945269648 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-libmount # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -73,7 +73,7 @@ %endif Summary: %main_summary License: GPL-2.0+ -Group: %main_group +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -149,6 +149,9 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: [email protected] +Source42: [email protected] +# Source51: blkid.conf ## ## util-linux patches @@ -161,6 +164,9 @@ Patch2: util-linux-lsmem-memory-zone-2.patch # PATCH-FEATURE-UPSTREAM util-linux-lsmem-memory-zone-3.patch bsc1065471 FATE324252 [email protected] -- lsmem: Add support for zone awareness. Patch3: util-linux-lsmem-memory-zone-3.patch +# Add four commits from upstream to pass tests on ppc64 +Patch4: util_linux_bigendian.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -173,26 +179,15 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: eject = 2.1.0 +Provides: login = 4.0 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 -# 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 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 +Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +195,7 @@ %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -404,6 +390,7 @@ %if %build_util_linux %package -n python-libmount Summary: %summary_pl +License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -420,6 +407,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -655,6 +643,9 @@ # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/[email protected] +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/[email protected] +ln -s "../bin/rfkill" %{buildroot}%{_sbindir}/rfkill %endif # # util-linux install @@ -788,10 +779,10 @@ %if %build_util_linux %pre -%{service_add_pre raw.service} +%service_add_pre raw.service [email protected] [email protected] %post -%{service_add_post raw.service} +%service_add_post raw.service [email protected] [email protected] %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -813,10 +804,10 @@ done %preun -%{service_del_preun raw.service} +%service_del_preun raw.service [email protected] [email protected] %postun -%{service_del_postun raw.service} +%service_del_postun raw.service [email protected] [email protected] %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +893,8 @@ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/[email protected] +%{_unitdir}/[email protected] %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -993,6 +986,7 @@ %{_bindir}/renice %{_bindir}/rev %{_bindir}/rfkill +%{_sbindir}/rfkill %{_bindir}/script %{_bindir}/scriptreplay %{_bindir}/setarch ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.FQkrPR/_old 2018-01-26 13:33:47.993267406 +0100 +++ /var/tmp/diff_new_pack.FQkrPR/_new 2018-01-26 13:33:48.001267033 +0100 @@ -1,7 +1,7 @@ # # spec file for package util-linux-systemd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,6 +149,9 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: [email protected] +Source42: [email protected] +# Source51: blkid.conf ## ## util-linux patches @@ -161,6 +164,9 @@ Patch2: util-linux-lsmem-memory-zone-2.patch # PATCH-FEATURE-UPSTREAM util-linux-lsmem-memory-zone-3.patch bsc1065471 FATE324252 [email protected] -- lsmem: Add support for zone awareness. Patch3: util-linux-lsmem-memory-zone-3.patch +# Add four commits from upstream to pass tests on ppc64 +Patch4: util_linux_bigendian.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -173,26 +179,15 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: eject = 2.1.0 +Provides: login = 4.0 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 -# 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 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 +Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +195,7 @@ %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -420,6 +406,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -655,6 +642,9 @@ # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/[email protected] +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/[email protected] +ln -s "../bin/rfkill" %{buildroot}%{_sbindir}/rfkill %endif # # util-linux install @@ -788,10 +778,10 @@ %if %build_util_linux %pre -%{service_add_pre raw.service} +%service_add_pre raw.service [email protected] [email protected] %post -%{service_add_post raw.service} +%service_add_post raw.service [email protected] [email protected] %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -813,10 +803,10 @@ done %preun -%{service_del_preun raw.service} +%service_del_preun raw.service [email protected] [email protected] %postun -%{service_del_postun raw.service} +%service_del_postun raw.service [email protected] [email protected] %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +892,8 @@ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/[email protected] +%{_unitdir}/[email protected] %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -993,6 +985,7 @@ %{_bindir}/renice %{_bindir}/rev %{_bindir}/rfkill +%{_sbindir}/rfkill %{_bindir}/script %{_bindir}/scriptreplay %{_bindir}/setarch ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.FQkrPR/_old 2018-01-26 13:33:48.041265165 +0100 +++ /var/tmp/diff_new_pack.FQkrPR/_new 2018-01-26 13:33:48.057264417 +0100 @@ -1,7 +1,7 @@ # # spec file for package util-linux # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -149,6 +149,9 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # +Source41: [email protected] +Source42: [email protected] +# Source51: blkid.conf ## ## util-linux patches @@ -161,6 +164,9 @@ Patch2: util-linux-lsmem-memory-zone-2.patch # PATCH-FEATURE-UPSTREAM util-linux-lsmem-memory-zone-3.patch bsc1065471 FATE324252 [email protected] -- lsmem: Add support for zone awareness. Patch3: util-linux-lsmem-memory-zone-3.patch +# Add four commits from upstream to pass tests on ppc64 +Patch4: util_linux_bigendian.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -173,26 +179,15 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions Recommends: %{name}-lang = %{version} -Provides: eject = 2.1.0-166.8 -Provides: login = 4.0-33.7 -Provides: rfkill = 0.5-8.6 +Provides: eject = 2.1.0 +Provides: login = 4.0 +Provides: rfkill = 0.5 # File conflict of eject (up to 12.3 and SLE11). -Obsoletes: eject < 2.1.0-166.8 +Obsoletes: eject <= 2.1.0 # File conflict of login (up to 12.1 and SLE11). -Obsoletes: login < 4.0-33.7 +Obsoletes: login <= 4.0 # File confluct (man page) of rfkill (up to Leap 15 and SLE 15). -Obsoletes: rfkill < 0.5-8.6 -# 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 -%if 0%{?suse_version} < 1330 -# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). -Conflicts: sysvinit-tools < 2.88+-87 -%endif -# rfkill conflicts of completion files with <= Leap 42.3 and < SLE15. -Conflicts: bash-completion <= 2.7-1.3 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) and since 12.2 in SLE (boo#1029775) -Conflicts: systemd-presets-branding < 12.2 +Obsoletes: rfkill <= 0.5 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -200,16 +195,7 @@ %endif # uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 Provides: uuid-runtime = %{version}-%{release} -Obsoletes: uuid-runtime < %{version}-%{release} -%if 0%{?suse_version} < 1330 -#BEGIN sysv compatibility hack -# After migration of raw init script to systemd, util-linux no more depends on -# fillup and insserv. Many poorly written packages implicitly depend on them -# without declaring it. Keep these dependencies in Leap 42 + SLE 12 line to -# prevent failures. -PreReq: %insserv_prereq %fillup_prereq -#END sysv compatibility hack -%endif +Obsoletes: uuid-runtime <= 2.19.1 # # Using "Requires" here would lend itself to help upgrading, but since # util-linux is in the initial bootstrap, that is not a good thing to do: @@ -420,6 +406,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -655,6 +642,9 @@ # klogconsole install make install DEST=%{buildroot} popd +install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/[email protected] +install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/[email protected] +ln -s "../bin/rfkill" %{buildroot}%{_sbindir}/rfkill %endif # # util-linux install @@ -788,10 +778,10 @@ %if %build_util_linux %pre -%{service_add_pre raw.service} +%service_add_pre raw.service [email protected] [email protected] %post -%{service_add_post raw.service} +%service_add_post raw.service [email protected] [email protected] %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux @@ -813,10 +803,10 @@ done %preun -%{service_del_preun raw.service} +%service_del_preun raw.service [email protected] [email protected] %postun -%{service_del_postun raw.service} +%service_del_postun raw.service [email protected] [email protected] %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount @@ -902,6 +892,8 @@ %doc Documentation/mount.txt %doc Documentation/pg.txt %{_unitdir}/raw.service +%{_unitdir}/[email protected] +%{_unitdir}/[email protected] %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf @@ -993,6 +985,7 @@ %{_bindir}/renice %{_bindir}/rev %{_bindir}/rfkill +%{_sbindir}/rfkill %{_bindir}/script %{_bindir}/scriptreplay %{_bindir}/setarch ++++++ [email protected] ++++++ [Unit] Description=RFKill-Block %I [email protected] [Service] Type=oneshot ExecStart=/usr/bin/rfkill block %I [Install] WantedBy=multi-user.target ++++++ [email protected] ++++++ [Unit] Description=RFKill-Unblock %I [email protected] [Service] Type=oneshot ExecStart=/usr/bin/rfkill unblock %I [Install] WantedBy=multi-user.target ++++++ util_linux_bigendian.patch ++++++ ++++ 663 lines (skipped)
