diff --git a/python-libmount.changes b/python-libmount.changes index fa3531d..10de5c5 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com + +- Conflict with old systemd-presets-branding to ensure correct + preset migration (boo#1029775, bsc#1012850). + +------------------------------------------------------------------- +Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com + +- Drop "codepage" fstab migration needed for SuSE Linux < 9.1 + (bsc#51950 (suse#36950)). + +------------------------------------------------------------------- +Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com + +- Keep dependency on insserv and fillup for compatibilitiy reasons + in Leap 42.3. Too many poorly written packages depend on it. + (Marked as "sysv compatibility hack".) + ------------------------------------------------------------------- Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index 087a7ba..e352dc3 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -73,7 +73,7 @@ Name: python-libmount %endif Summary: %main_summary License: GPL-2.0+ -Group: %group_pl +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -179,8 +179,8 @@ Conflicts: coreutils < 8.21 Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) -Conflicts: systemd-presets-branding < 0.4 +# 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 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +189,15 @@ Provides: s390-32 # 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 # # 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: @@ -385,7 +394,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -788,11 +796,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do fi done -# mount option 'code=' is now called 'codepage=' so change fstab -if [ -f etc/fstab ]; then - sed -i 's:code=:codepage=:' etc/fstab -fi - %preun %{service_del_preun raw.service} @@ -855,7 +858,6 @@ fi %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} - %endif %if %build_util_linux @@ -1258,7 +1260,6 @@ fi %files -n libfdisk-devel-static %defattr(-, root, root) %{_libdir}/libfdisk.*a - %endif %if %build_util_linux_systemd diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index fa3531d..10de5c5 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com + +- Conflict with old systemd-presets-branding to ensure correct + preset migration (boo#1029775, bsc#1012850). + +------------------------------------------------------------------- +Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com + +- Drop "codepage" fstab migration needed for SuSE Linux < 9.1 + (bsc#51950 (suse#36950)). + +------------------------------------------------------------------- +Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com + +- Keep dependency on insserv and fillup for compatibilitiy reasons + in Leap 42.3. Too many poorly written packages depend on it. + (Marked as "sysv compatibility hack".) + ------------------------------------------------------------------- Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index b76c8d9..e191e6b 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -179,8 +179,8 @@ Conflicts: coreutils < 8.21 Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) -Conflicts: systemd-presets-branding < 0.4 +# 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 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +189,15 @@ Provides: s390-32 # 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 # # 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: @@ -787,11 +796,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do fi done -# mount option 'code=' is now called 'codepage=' so change fstab -if [ -f etc/fstab ]; then - sed -i 's:code=:codepage=:' etc/fstab -fi - %preun %{service_del_preun raw.service} @@ -854,7 +858,6 @@ fi %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} - %endif %if %build_util_linux @@ -1257,7 +1260,6 @@ fi %files -n libfdisk-devel-static %defattr(-, root, root) %{_libdir}/libfdisk.*a - %endif %if %build_util_linux_systemd diff --git a/util-linux.changes b/util-linux.changes index fa3531d..10de5c5 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Mar 17 17:18:28 CET 2017 - sbrabec@suse.com + +- Conflict with old systemd-presets-branding to ensure correct + preset migration (boo#1029775, bsc#1012850). + +------------------------------------------------------------------- +Thu Mar 16 22:44:12 CET 2017 - sbrabec@suse.com + +- Drop "codepage" fstab migration needed for SuSE Linux < 9.1 + (bsc#51950 (suse#36950)). + +------------------------------------------------------------------- +Tue Feb 28 17:27:58 CET 2017 - sbrabec@suse.com + +- Keep dependency on insserv and fillup for compatibilitiy reasons + in Leap 42.3. Too many poorly written packages depend on it. + (Marked as "sysv compatibility hack".) + ------------------------------------------------------------------- Wed Feb 22 22:00:05 UTC 2017 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index d7fe212..0cc4b19 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -179,8 +179,8 @@ Conflicts: coreutils < 8.21 Conflicts: sysvinit-tools < 2.88+-87 # File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). Conflicts: bash-completion <= 2.1-13.1 -# The preset is provided by the presets branding package since 0.4 (bsc#1012850) -Conflicts: systemd-presets-branding < 0.4 +# 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 # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -189,6 +189,15 @@ Provides: s390-32 # 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 # # 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: @@ -787,11 +796,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do fi done -# mount option 'code=' is now called 'codepage=' so change fstab -if [ -f etc/fstab ]; then - sed -i 's:code=:codepage=:' etc/fstab -fi - %preun %{service_del_preun raw.service} @@ -854,7 +858,6 @@ fi %postun -n uuidd %{service_del_postun uuidd.socket uuidd.service} - %endif %if %build_util_linux @@ -1257,7 +1260,6 @@ fi %files -n libfdisk-devel-static %defattr(-, root, root) %{_libdir}/libfdisk.*a - %endif %if %build_util_linux_systemd