From c93d5471f0c012bd8c28ad2037b75450eac937806ad25c5c63ccd8ee47c04a29 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 15 Jan 2024 12:50:16 +0000 Subject: [PATCH] Accepting request 1138564 from home:munix9:branches:graphics - Fix incomplete removal of update-alternatives for config - Replace obsolete 'otherproviders(imagick-%{config_spec})' with 'Conflicts: imagick-%{config_spec}' OBS-URL: https://build.opensuse.org/request/show/1138564 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=696 --- ImageMagick.changes | 7 ++++ ImageMagick.spec | 87 +++++++++++++++++++++++++++------------------ 2 files changed, 60 insertions(+), 34 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index cdaae4f..17763df 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 14 10:57:43 UTC 2024 - munix9@googlemail.com + +- Fix incomplete removal of update-alternatives for config +- Replace obsolete 'otherproviders(imagick-%{config_spec})' with + 'Conflicts: imagick-%{config_spec}' + ------------------------------------------------------------------- Fri Jan 12 15:32:08 UTC 2024 - Arjen de Korte diff --git a/ImageMagick.spec b/ImageMagick.spec index 016128a..06d8216 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -161,34 +161,39 @@ BuildArch: noarch %package %{config_spec}-upstream-open Summary: Open ImageMagick Security Policy Group: Development/Libraries/C and C++ -Provides: imagick-%{config_spec} -Conflicts: otherproviders(imagick-%{config_spec}) +Conflicts: imagick-%{config_spec} +Provides: imagick-%{config_spec} = %{version} Obsoletes: %{config_spec}-upstream < %{version} Provides: %{config_spec}-upstream = %{version} +BuildArch: noarch %package %{config_spec}-upstream-limited Summary: Limited ImageMagick Security Policy Group: Development/Libraries/C and C++ -Provides: imagick-%{config_spec} -Conflicts: otherproviders(imagick-%{config_spec}) +Conflicts: imagick-%{config_spec} +Provides: imagick-%{config_spec} = %{version} +BuildArch: noarch %package %{config_spec}-upstream-secure Summary: Secure ImageMagick Security Policy Group: Development/Libraries/C and C++ -Provides: imagick-%{config_spec} -Conflicts: otherproviders(imagick-%{config_spec}) +Conflicts: imagick-%{config_spec} +Provides: imagick-%{config_spec} = %{version} +BuildArch: noarch %package %{config_spec}-upstream-websafe Summary: Web-safe ImageMagick Security Policy Group: Development/Libraries/C and C++ -Provides: imagick-%{config_spec} -Conflicts: otherproviders(imagick-%{config_spec}) +Conflicts: imagick-%{config_spec} +Provides: imagick-%{config_spec} = %{version} +BuildArch: noarch %package %{config_spec}-SUSE Summary: SUSE Provided Configuration Group: Development/Libraries/C and C++ -Provides: imagick-%{config_spec} -Conflicts: otherproviders(imagick-%{config_spec}) +Conflicts: imagick-%{config_spec} +Provides: imagick-%{config_spec} = %{version} +BuildArch: noarch %description ImageMagick is a robust collection of tools and libraries to read, @@ -410,7 +415,7 @@ sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec %make_build all %make_build -j1 perl-build -# mostly because */demo is used later with %check +# mostly because */demo is used later with %%check # polutting dir with .libs etc. cp -r Magick++/demo Magick++/examples cp -r PerlMagick/demo PerlMagick/examples @@ -453,13 +458,12 @@ done mv %{buildroot}%{_sysconfdir}/%{config_dir}{,-SUSE} cp config/policy-secure.xml %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE patch --fuzz=0 --dir %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE < %{PATCH0} -mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ -ln -sf %{_sysconfdir}/alternatives/%{config_dir} %{buildroot}%{_sysconfdir}/%{config_dir} +ln -sf %{config_dir}-SUSE %{buildroot}%{_sysconfdir}/%{config_dir} # symlink header file relative to /usr/include/ImageMagick-7/ # so that inclusions like wand/*.h and magick/*.h work ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand -# these will be included via %doc +# these will be included via %%doc rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ rm %{buildroot}%{_libdir}/*.la # remove RPATH from perl module @@ -482,6 +486,26 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con %post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig +%post %{config_spec}-SUSE +rm -f %{_sysconfdir}/alternatives/%{config_dir} +ln -sf %{config_dir}-SUSE %{_sysconfdir}/%{config_dir} + +%post %{config_spec}-upstream-limited +rm -f %{_sysconfdir}/alternatives/%{config_dir} +ln -sf %{config_dir}-upstream-limited %{_sysconfdir}/%{config_dir} + +%post %{config_spec}-upstream-open +rm -f %{_sysconfdir}/alternatives/%{config_dir} +ln -sf %{config_dir}-upstream-open %{_sysconfdir}/%{config_dir} + +%post %{config_spec}-upstream-secure +rm -f %{_sysconfdir}/alternatives/%{config_dir} +ln -sf %{config_dir}-upstream-secure %{_sysconfdir}/%{config_dir} + +%post %{config_spec}-upstream-websafe +rm -f %{_sysconfdir}/alternatives/%{config_dir} +ln -sf %{config_dir}-upstream-websafe %{_sysconfdir}/%{config_dir} + %files %license LICENSE %doc NEWS.txt @@ -562,33 +586,28 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con %{_defaultdocdir}/%{name}-%{maj} %files %{config_spec}-upstream-open -%dir %{_sysconfdir}/ImageMagick*-upstream-open/ -%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-open/* -%{_sysconfdir}/%{config_dir} -%ghost %{_sysconfdir}/alternatives/%{config_dir} +%dir %{_sysconfdir}/%{config_dir}-upstream-open/ +%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-open/* +%ghost %{_sysconfdir}/%{config_dir} %files %{config_spec}-upstream-limited -%dir %{_sysconfdir}/ImageMagick*-upstream-limited/ -%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-limited/* -%{_sysconfdir}/%{config_dir} -%ghost %{_sysconfdir}/alternatives/%{config_dir} +%dir %{_sysconfdir}/%{config_dir}-upstream-limited/ +%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-limited/* +%ghost %{_sysconfdir}/%{config_dir} %files %{config_spec}-upstream-secure -%dir %{_sysconfdir}/ImageMagick*-upstream-secure/ -%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-secure/* -%{_sysconfdir}/%{config_dir} -%ghost %{_sysconfdir}/alternatives/%{config_dir} +%dir %{_sysconfdir}/%{config_dir}-upstream-secure/ +%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-secure/* +%ghost %{_sysconfdir}/%{config_dir} %files %{config_spec}-SUSE -%dir %{_sysconfdir}/ImageMagick*-SUSE/ -%config %{_sysconfdir}/ImageMagick*-SUSE/* -%{_sysconfdir}/%{config_dir} -%ghost %{_sysconfdir}/alternatives/%{config_dir} +%dir %{_sysconfdir}/%{config_dir}-SUSE/ +%config %{_sysconfdir}/%{config_dir}-SUSE/* +%ghost %{_sysconfdir}/%{config_dir} %files %{config_spec}-upstream-websafe -%dir %{_sysconfdir}/ImageMagick*-upstream-websafe/ -%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-websafe/* -%{_sysconfdir}/%{config_dir} -%ghost %{_sysconfdir}/alternatives/%{config_dir} +%dir %{_sysconfdir}/%{config_dir}-upstream-websafe/ +%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-websafe/* +%ghost %{_sysconfdir}/%{config_dir} %changelog