pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1138564 from home:munix9:branches:graphics

Browse Source 
- 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
This commit is contained in:
Petr Gajdos 2024-01-15 12:50:16 +00:00 committed by Git OBS Bridge
parent 3a04bfbd9c
commit c93d5471f0
2 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ImageMagick.changes
View File

@ -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 <suse+build@de-korte.org> Fri Jan 12 15:32:08 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>

87
ImageMagick.spec
View File

@ -161,34 +161,39 @@ BuildArch: noarch
%package %{config_spec}-upstream-open %package %{config_spec}-upstream-open
Summary: Open ImageMagick Security Policy Summary: Open ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Conflicts: imagick-%{config_spec}
Conflicts: otherproviders(imagick-%{config_spec}) Provides: imagick-%{config_spec} = %{version}
Obsoletes: %{config_spec}-upstream < %{version} Obsoletes: %{config_spec}-upstream < %{version}
Provides: %{config_spec}-upstream = %{version} Provides: %{config_spec}-upstream = %{version}
BuildArch: noarch
%package %{config_spec}-upstream-limited %package %{config_spec}-upstream-limited
Summary: Limited ImageMagick Security Policy Summary: Limited ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Conflicts: imagick-%{config_spec}
Conflicts: otherproviders(imagick-%{config_spec}) Provides: imagick-%{config_spec} = %{version}
BuildArch: noarch
%package %{config_spec}-upstream-secure %package %{config_spec}-upstream-secure
Summary: Secure ImageMagick Security Policy Summary: Secure ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Conflicts: imagick-%{config_spec}
Conflicts: otherproviders(imagick-%{config_spec}) Provides: imagick-%{config_spec} = %{version}
BuildArch: noarch
%package %{config_spec}-upstream-websafe %package %{config_spec}-upstream-websafe
Summary: Web-safe ImageMagick Security Policy Summary: Web-safe ImageMagick Security Policy
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Conflicts: imagick-%{config_spec}
Conflicts: otherproviders(imagick-%{config_spec}) Provides: imagick-%{config_spec} = %{version}
BuildArch: noarch
%package %{config_spec}-SUSE %package %{config_spec}-SUSE
Summary: SUSE Provided Configuration Summary: SUSE Provided Configuration
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: imagick-%{config_spec} Conflicts: imagick-%{config_spec}
Conflicts: otherproviders(imagick-%{config_spec}) Provides: imagick-%{config_spec} = %{version}
BuildArch: noarch
%description %description
ImageMagick is a robust collection of tools and libraries to read, 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 # [1] http://pkgs.fedoraproject.org/cgit/ImageMagick.git/tree/ImageMagick.spec
%make_build all %make_build all
%make_build -j1 perl-build %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. # polutting dir with .libs etc.
cp -r Magick++/demo Magick++/examples cp -r Magick++/demo Magick++/examples
cp -r PerlMagick/demo PerlMagick/examples cp -r PerlMagick/demo PerlMagick/examples
@ -453,13 +458,12 @@ done
mv %{buildroot}%{_sysconfdir}/%{config_dir}{,-SUSE} mv %{buildroot}%{_sysconfdir}/%{config_dir}{,-SUSE}
cp config/policy-secure.xml %{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} patch --fuzz=0 --dir %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE < %{PATCH0}
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ ln -sf %{config_dir}-SUSE %{buildroot}%{_sysconfdir}/%{config_dir}
ln -sf %{_sysconfdir}/alternatives/%{config_dir} %{buildroot}%{_sysconfdir}/%{config_dir}
# symlink header file relative to /usr/include/ImageMagick-7/ # symlink header file relative to /usr/include/ImageMagick-7/
# so that inclusions like wand/*.h and magick/*.h work # so that inclusions like wand/*.h and magick/*.h work
ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick ln -s ./MagickCore %{buildroot}%{_includedir}/%{name}-%{maj}/magick
ln -s ./MagickWand %{buildroot}%{_includedir}/%{name}-%{maj}/wand 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 -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/
rm %{buildroot}%{_libdir}/*.la rm %{buildroot}%{_libdir}/*.la
# remove RPATH from perl module # 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 %post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
%postun -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 %files
%license LICENSE %license LICENSE
%doc NEWS.txt %doc NEWS.txt
@ -562,33 +586,28 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
%{_defaultdocdir}/%{name}-%{maj} %{_defaultdocdir}/%{name}-%{maj}
%files %{config_spec}-upstream-open %files %{config_spec}-upstream-open
%dir %{_sysconfdir}/ImageMagick*-upstream-open/ %dir %{_sysconfdir}/%{config_dir}-upstream-open/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-open/* %config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-open/*
%{_sysconfdir}/%{config_dir} %ghost %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-limited %files %{config_spec}-upstream-limited
%dir %{_sysconfdir}/ImageMagick*-upstream-limited/ %dir %{_sysconfdir}/%{config_dir}-upstream-limited/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-limited/* %config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-limited/*
%{_sysconfdir}/%{config_dir} %ghost %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-secure %files %{config_spec}-upstream-secure
%dir %{_sysconfdir}/ImageMagick*-upstream-secure/ %dir %{_sysconfdir}/%{config_dir}-upstream-secure/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-secure/* %config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-secure/*
%{_sysconfdir}/%{config_dir} %ghost %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-SUSE %files %{config_spec}-SUSE
%dir %{_sysconfdir}/ImageMagick*-SUSE/ %dir %{_sysconfdir}/%{config_dir}-SUSE/
%config %{_sysconfdir}/ImageMagick*-SUSE/* %config %{_sysconfdir}/%{config_dir}-SUSE/*
%{_sysconfdir}/%{config_dir} %ghost %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir}
%files %{config_spec}-upstream-websafe %files %{config_spec}-upstream-websafe
%dir %{_sysconfdir}/ImageMagick*-upstream-websafe/ %dir %{_sysconfdir}/%{config_dir}-upstream-websafe/
%config(noreplace) %{_sysconfdir}/ImageMagick*-upstream-websafe/* %config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-websafe/*
%{_sysconfdir}/%{config_dir} %ghost %{_sysconfdir}/%{config_dir}
%ghost %{_sysconfdir}/alternatives/%{config_dir}
%changelog %changelog