From c93d5471f0c012bd8c28ad2037b75450eac937806ad25c5c63ccd8ee47c04a29 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 15 Jan 2024 12:50:16 +0000 Subject: [PATCH 01/12] 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 From 4c468d9c77c6ee48099f4917a5ee4cf9a42ad3743177b4f97017c4760969b365 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 15 Jan 2024 15:11:04 +0000 Subject: [PATCH 02/12] - use correct policy.xml OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=697 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 17763df..24a9512 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 15 14:30:40 UTC 2024 - pgajdos@suse.com + +- use correct policy.xml + ------------------------------------------------------------------- Sun Jan 14 10:57:43 UTC 2024 - munix9@googlemail.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 06d8216..e1a7a1c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -424,6 +424,7 @@ chmod -x PerlMagick/demo/*.pl exit 0 %check +exit 0 %if %{debug_build} || %{asan_build} # testsuite does not succeed for some reason # research TODO @@ -453,7 +454,7 @@ cd .. mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml for policy in open limited secure websafe; do cp -r %{buildroot}%{_sysconfdir}/%{config_dir}{,-upstream-$policy} - cp config/policy-$policy.xml %{buildroot}%{_sysconfdir}/%{config_dir}-upstream-$policy + cp config/policy-$policy.xml %{buildroot}%{_sysconfdir}/%{config_dir}-upstream-$policy/policy.xml done mv %{buildroot}%{_sysconfdir}/%{config_dir}{,-SUSE} cp config/policy-secure.xml %{buildroot}%{_sysconfdir}/%{config_dir}-SUSE From cf20f3202910c52d0fac5cdaf734509cc309821af6cfe04bb1d7b29da3b7e75f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 15 Jan 2024 15:11:44 +0000 Subject: [PATCH 03/12] enable %check again OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=698 --- ImageMagick.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index e1a7a1c..772cf3b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -424,7 +424,6 @@ chmod -x PerlMagick/demo/*.pl exit 0 %check -exit 0 %if %{debug_build} || %{asan_build} # testsuite does not succeed for some reason # research TODO From 9367404cf0ca9b22289e879a0f0b900f43ee18b85cb050b4d14741a08da1580f Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 16 Jan 2024 14:53:58 +0000 Subject: [PATCH 04/12] Accepting request 1139000 from home:munix9:branches:graphics as suggested via email. OBS-URL: https://build.opensuse.org/request/show/1139000 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=700 --- ImageMagick.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 772cf3b..888b2c6 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -487,23 +487,23 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con %postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig %post %{config_spec}-SUSE -rm -f %{_sysconfdir}/alternatives/%{config_dir} +rm -f %{_sysconfdir}/%{config_dir} ln -sf %{config_dir}-SUSE %{_sysconfdir}/%{config_dir} %post %{config_spec}-upstream-limited -rm -f %{_sysconfdir}/alternatives/%{config_dir} +rm -f %{_sysconfdir}/%{config_dir} ln -sf %{config_dir}-upstream-limited %{_sysconfdir}/%{config_dir} %post %{config_spec}-upstream-open -rm -f %{_sysconfdir}/alternatives/%{config_dir} +rm -f %{_sysconfdir}/%{config_dir} ln -sf %{config_dir}-upstream-open %{_sysconfdir}/%{config_dir} %post %{config_spec}-upstream-secure -rm -f %{_sysconfdir}/alternatives/%{config_dir} +rm -f %{_sysconfdir}/%{config_dir} ln -sf %{config_dir}-upstream-secure %{_sysconfdir}/%{config_dir} %post %{config_spec}-upstream-websafe -rm -f %{_sysconfdir}/alternatives/%{config_dir} +rm -f %{_sysconfdir}/%{config_dir} ln -sf %{config_dir}-upstream-websafe %{_sysconfdir}/%{config_dir} %files From 4537b9de3063775e61454d9703df569a0e07011bdc36a1cd499fa7b9b468db6d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 16 Jan 2024 15:07:59 +0000 Subject: [PATCH 05/12] - only one configuration again, based on upstream 'secure' policy - other upstream policies packaged in documentation OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=701 --- ImageMagick.changes | 6 ++ ImageMagick.spec | 184 ++++++-------------------------------------- 2 files changed, 31 insertions(+), 159 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index 24a9512..43e897f 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 16 14:54:49 UTC 2024 - pgajdos@suse.com + +- only one configuration again, based on upstream 'secure' policy +- other upstream policies packaged in documentation + ------------------------------------------------------------------- Mon Jan 15 14:30:40 UTC 2024 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 888b2c6..875d471 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -27,8 +27,6 @@ %define cwandver 10 %define cxxlibver 5 %define libspec -%{maj}_Q%{quantum_depth}HDRI -%define config_dir ImageMagick-7 -%define config_spec config-7 %define test_verbose 1 # bsc#1088463 %define urw_base35_fonts 0 @@ -98,6 +96,13 @@ BuildRequires: urw-base35-fonts BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std %endif +Obsoletes: ImageMagick-config-7-SUSE < %{version} +Provides: ImageMagick-config-7-SUSE = %{version} +Obsoletes: ImageMagick-config-7-upstream +Obsoletes: ImageMagick-config-7-upstream-open +Obsoletes: ImageMagick-config-7-upstream-secure +Obsoletes: ImageMagick-config-7-upstream-websafe +Obsoletes: imagemagick-config-7-upstream-limited %package -n perl-PerlMagick Summary: Perl interface for ImageMagick @@ -132,10 +137,8 @@ Recommends: transfig %package -n libMagickCore%{libspec}%{clibver} Summary: C runtime library for ImageMagick Group: Productivity/Graphics/Other -Requires: imagick-%{config_spec} -Recommends: %{config_spec}-SUSE Recommends: ghostscript -Suggests: %{name}-extra = %{version} +Suggests: ImageMagick-extra = %{version} %package -n libMagickWand%{libspec}%{cwandver} Summary: C runtime library for ImageMagick @@ -144,7 +147,7 @@ Group: Productivity/Graphics/Other %package -n libMagick++%{libspec}%{cxxlibver} Summary: C++ interface runtime library for ImageMagick Group: Development/Libraries/C and C++ -Requires: %{name} +Requires: ImageMagick %package -n libMagick++-devel Summary: Development files for ImageMagick's C++ interface @@ -158,43 +161,6 @@ Summary: Document Files for ImageMagick Library Group: Documentation/HTML BuildArch: noarch -%package %{config_spec}-upstream-open -Summary: Open ImageMagick Security Policy -Group: Development/Libraries/C and C++ -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++ -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++ -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++ -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++ -Conflicts: imagick-%{config_spec} -Provides: imagick-%{config_spec} = %{version} -BuildArch: noarch - %description ImageMagick is a robust collection of tools and libraries to read, write, and manipulate an image in many image formats, including popular @@ -293,59 +259,9 @@ support multiple generations of an image in memory at one time. %description doc HTML documentation for ImageMagick library and scene examples. -%description %{config_spec}-upstream-open -This policy is designed for usage in secure settings like those -protected by firewalls or within Docker containers. Within this framework, -ImageMagick enjoys broad access to resources and functionalities. This policy -provides convenient and adaptable options for image manipulation. However, -it's important to note that it might present security vulnerabilities in -less regulated conditions. Thus, organizations should thoroughly assess -the appropriateness of the open policy according to their particular use -case and security prerequisites. - -%description %{config_spec}-upstream-limited -The primary objective of the limited security policy is to find a -middle ground between convenience and security. This policy involves the -deactivation of potentially hazardous functionalities, like specific coders -such as SVG or HTTP. Furthermore, it establishes several constraints on -the utilization of resources like memory, storage, and processing duration, -all of which are adjustable. This policy proves advantageous in situations -where there's a need to mitigate the potential threat of handling possibly -malicious or demanding images, all while retaining essential capabilities -for prevalent image formats. - -%description %{config_spec}-upstream-secure -This stringent security policy prioritizes the implementation of -rigorous controls and restricted resource utilization to establish a -profoundly secure setting while employing ImageMagick. It deactivates -conceivably hazardous functionalities, including specific coders like -SVG or HTTP. The policy promotes the tailoring of security measures to -harmonize with the requirements of the local environment and the guidelines -of the organization. This protocol encompasses explicit particulars like -limitations on memory consumption, sanctioned pathways for reading and -writing, confines on image sequences, the utmost permissible duration of -workflows, allocation of disk space intended for image data, and even an -undisclosed passphrase for remote connections. By adopting this robust -policy, entities can elevate their overall security stance and alleviate -potential vulnerabilities. - -%description %{config_spec}-upstream-websafe -This security protocol designed for web-safe usage focuses on situations -where ImageMagick is applied in publicly accessible contexts, like websites. -It deactivates the capability to read from or write to any image formats -other than web-safe formats like GIF, JPEG, and PNG. Additionally, this -policy prohibits the execution of image filters and indirect reads, thereby -thwarting potential security breaches. By implementing these limitations, -the web-safe policy fortifies the safeguarding of systems accessible to -the public, reducing the risk of exploiting ImageMagick's capabilities -for potential attacks. - -%description %{config_spec}-SUSE -ImageMagick configuration as provide by SUSE. It is upstream 'secure' -policy plus disable few other coders for reading and/or writing. - %prep %setup -q -n ImageMagick-%{source_version} +%patch0 -p1 %patch2 -p1 %ifarch i586 %if %{?suse_version} < 1550 @@ -405,7 +321,8 @@ export CXXFLAGS="%{optflags} -O0" --without-gcc-arch \ --enable-pipes=no \ --enable-reproducible-build=yes \ - --disable-openmp + --disable-openmp \ + --with-security-policy=open # open for %check %if %{asan_build} sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ -e 's/\(^LIBS =.*\)/\1 -lasan/' \ @@ -448,23 +365,13 @@ sed -i 's:TEST_VERBOSE=0:TEST_VERBOSE=1:' Makefile cd .. %install -%make_install pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ -# configuration magic -mv -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml -for policy in open limited secure websafe; do - cp -r %{buildroot}%{_sysconfdir}/%{config_dir}{,-upstream-$policy} - cp config/policy-$policy.xml %{buildroot}%{_sysconfdir}/%{config_dir}-upstream-$policy/policy.xml -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} -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 +%make_install pkgdocdir=%{_defaultdocdir}/ImageMagick-%{maj}/ +# suse modified secure policy as a default +cp config/policy-secure.xml %{buildroot}/etc/ImageMagick-%{maj}/policy.xml +ln -s ./MagickCore %{buildroot}%{_includedir}/ImageMagick-%{maj}/magick +ln -s ./MagickWand %{buildroot}%{_includedir}/ImageMagick-%{maj}/wand # these will be included via %%doc -rm -r %{buildroot}%{_datadir}/doc/%{name}-%{maj}/ +rm -r %{buildroot}%{_datadir}/doc/ImageMagick-%{maj}/ rm %{buildroot}%{_libdir}/*.la # remove RPATH from perl module perl_module=$(find %{buildroot}%{_prefix}/lib/perl5 -name '*.so') @@ -474,8 +381,8 @@ chmod 555 $perl_module # remove %%{buildroot} from distributed file sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/config%{libspec}%{clibver}/configure.xml #remove duplicates -%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-%{maj} -%fdupes -s %{buildroot}%{_includedir}/%{name}-%{maj} +%fdupes -s %{buildroot}%{_defaultdocdir}/ImageMagick-%{maj} +%fdupes -s %{buildroot}%{_includedir}/ImageMagick-%{maj} %fdupes -s %{buildroot}%{_libdir}/pkgconfig %perl_process_packlist @@ -486,32 +393,16 @@ 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}/%{config_dir} -ln -sf %{config_dir}-SUSE %{_sysconfdir}/%{config_dir} - -%post %{config_spec}-upstream-limited -rm -f %{_sysconfdir}/%{config_dir} -ln -sf %{config_dir}-upstream-limited %{_sysconfdir}/%{config_dir} - -%post %{config_spec}-upstream-open -rm -f %{_sysconfdir}/%{config_dir} -ln -sf %{config_dir}-upstream-open %{_sysconfdir}/%{config_dir} - -%post %{config_spec}-upstream-secure -rm -f %{_sysconfdir}/%{config_dir} -ln -sf %{config_dir}-upstream-secure %{_sysconfdir}/%{config_dir} - -%post %{config_spec}-upstream-websafe -rm -f %{_sysconfdir}/%{config_dir} -ln -sf %{config_dir}-upstream-websafe %{_sysconfdir}/%{config_dir} - %files %license LICENSE %doc NEWS.txt +%doc config/policy-{open,limited,secure,websafe}.xml %{_bindir}/[^MW]* %{_mandir}/man1/* %exclude %{_mandir}/man1/*-config.1%{ext_man} +%dir %{_sysconfdir}/ImageMagick-%{maj} +%config(noreplace) %{_sysconfdir}/ImageMagick-%{maj}/* +%{_datadir}/ImageMagick-%{maj} %files -n libMagickCore%{libspec}%{clibver} %license LICENSE @@ -583,31 +474,6 @@ ln -sf %{config_dir}-upstream-websafe %{_sysconfdir}/%{config_dir} %{_mandir}/man1/Magick++-config.1%{?ext_man} %files doc -%{_defaultdocdir}/%{name}-%{maj} - -%files %{config_spec}-upstream-open -%dir %{_sysconfdir}/%{config_dir}-upstream-open/ -%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-open/* -%ghost %{_sysconfdir}/%{config_dir} - -%files %{config_spec}-upstream-limited -%dir %{_sysconfdir}/%{config_dir}-upstream-limited/ -%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-limited/* -%ghost %{_sysconfdir}/%{config_dir} - -%files %{config_spec}-upstream-secure -%dir %{_sysconfdir}/%{config_dir}-upstream-secure/ -%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-secure/* -%ghost %{_sysconfdir}/%{config_dir} - -%files %{config_spec}-SUSE -%dir %{_sysconfdir}/%{config_dir}-SUSE/ -%config %{_sysconfdir}/%{config_dir}-SUSE/* -%ghost %{_sysconfdir}/%{config_dir} - -%files %{config_spec}-upstream-websafe -%dir %{_sysconfdir}/%{config_dir}-upstream-websafe/ -%config(noreplace) %{_sysconfdir}/%{config_dir}-upstream-websafe/* -%ghost %{_sysconfdir}/%{config_dir} +%{_defaultdocdir}/ImageMagick-%{maj} %changelog From 8dff6ac8da3d1d6412d5bf567da00fa9634219a4bfcb4bf30a111486c758a174 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 16 Jan 2024 15:17:52 +0000 Subject: [PATCH 06/12] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=702 --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 875d471..12aedd9 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -147,7 +147,7 @@ Group: Productivity/Graphics/Other %package -n libMagick++%{libspec}%{cxxlibver} Summary: C++ interface runtime library for ImageMagick Group: Development/Libraries/C and C++ -Requires: ImageMagick +Requires: %{name} %package -n libMagick++-devel Summary: Development files for ImageMagick's C++ interface From 05fe2ec6c45b7c7872a4712bb0c767044c622f0bdcd1694ab6b8cbda318377b1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 16 Jan 2024 15:22:51 +0000 Subject: [PATCH 07/12] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=703 --- ImageMagick.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 12aedd9..3908b9a 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -139,15 +139,17 @@ Summary: C runtime library for ImageMagick Group: Productivity/Graphics/Other Recommends: ghostscript Suggests: ImageMagick-extra = %{version} +Recommends: ImageMagick %package -n libMagickWand%{libspec}%{cwandver} Summary: C runtime library for ImageMagick Group: Productivity/Graphics/Other +Recommends: ImageMagick %package -n libMagick++%{libspec}%{cxxlibver} Summary: C++ interface runtime library for ImageMagick Group: Development/Libraries/C and C++ -Requires: %{name} +Recommends: ImageMagick %package -n libMagick++-devel Summary: Development files for ImageMagick's C++ interface From 5b9d2d6e118c85154aa581253844a45a171d0573f6ea4a89692a793c66d78bf2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 22 Jan 2024 10:07:15 +0000 Subject: [PATCH 08/12] Accepting request 1140320 from home:adkorte - version update to 7.1.1.27 https://github.com/ImageMagick/Website/blob/main/ChangeLog.md OBS-URL: https://build.opensuse.org/request/show/1140320 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=704 --- ImageMagick-7.1.1-26.tar.xz | 3 --- ImageMagick-7.1.1-26.tar.xz.asc | 16 ---------------- ImageMagick-7.1.1-27.tar.xz | 3 +++ ImageMagick-7.1.1-27.tar.xz.asc | 16 ++++++++++++++++ ImageMagick.changes | 6 ++++++ ImageMagick.spec | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 ImageMagick-7.1.1-26.tar.xz delete mode 100644 ImageMagick-7.1.1-26.tar.xz.asc create mode 100644 ImageMagick-7.1.1-27.tar.xz create mode 100644 ImageMagick-7.1.1-27.tar.xz.asc diff --git a/ImageMagick-7.1.1-26.tar.xz b/ImageMagick-7.1.1-26.tar.xz deleted file mode 100644 index 5d84947..0000000 --- a/ImageMagick-7.1.1-26.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c7eb871fd97a5925fe03386bfab84c7ef6373371ae5e4666902aeafcea917ec -size 10554692 diff --git a/ImageMagick-7.1.1-26.tar.xz.asc b/ImageMagick-7.1.1-26.tar.xz.asc deleted file mode 100644 index 5c5b62f..0000000 --- a/ImageMagick-7.1.1-26.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmWa850ACgkQiatj1IJ3 -N3q8sxAAitWqoI50NFh3KraGfzPKB8FmIfjpBUUTsGATYUvXRxt+oDe6XQ+Kzi1T -SplAbi/IxrDutIcWVhuQa+SbNbL7SwpLvQ1wMWrevSIuTJokjclTTLVBUcJMWurW -6WHOHgfkXlkacAv5vjytbe1lWEFuAljqf6w1F7yJVOFnxuIFtoAZgkTDeMEU3Fkw -qhksxKXbG8ODvsjEDuGRPxI/UwtVznk4OsXs/FOOvuTV6iVum7DfmU6xo5IUkkfD -bCKWzRdjS3DsvNI+Zn5WmUNSoZzDQzyR9WzdwU6Mfeo3mTT6+6uhmkAxk1AJZWUs -oQGglJKZKEu7eEkgbVtZnkFEpoMkNN62McEt0t0DVGtJDkaMRgwie1B6Bfpu31+W -BWkRZWgvqkcOViEE155HTxqAPTMt+M4D58RZkC+qk0her/GwKiH8sx4KjvCmREnF -3zBK6Elr4Qcqqp8kX2nba8k8k0RIjkMdFuWrMcfL5Ro99NK8vo890u14FQPhJ7Nl -zB3YLl8sTPT8vxhl2Zs8zn+FOV7oavAf++7nurHMyWN/hsEhWRWnvluYaYJ09byH -p728xZSq4W8369+nO6jc4j1XzDU8xMcptrGXd/vdox7+Yt58dQ7wWPfJRAD88uf2 -ys67OFFkZsOnLHI76apQBYHqaCzGr0aTFMyMzEGg7su41ijgZo8= -=we2n ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-27.tar.xz b/ImageMagick-7.1.1-27.tar.xz new file mode 100644 index 0000000..b286e8c --- /dev/null +++ b/ImageMagick-7.1.1-27.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca23eb8f980cccbc9ea1e1490edd0fb33699fd2283790378049a505809a2f7d0 +size 10564680 diff --git a/ImageMagick-7.1.1-27.tar.xz.asc b/ImageMagick-7.1.1-27.tar.xz.asc new file mode 100644 index 0000000..e6fef86 --- /dev/null +++ b/ImageMagick-7.1.1-27.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmWtNpAACgkQiatj1IJ3 +N3o7iw//Wa2vM84g/pqHSVOgX0sgEUDFhwJVH57zWRylBsnElz07nNZo2ub3Jm9g +w4VI1hlgiNArcn+gbGwE0B1K2dATSY+5SAmS2OCbn33Z/2x0CAWV1ThPyT5Nc1BO +VG8qlrrtn0ucYmBh3xU03mhnnR5/GGhaL2yBkXoj0y5nQm/F/VuqvYUCr+LKzSLB +x3Ga+gIzeohgb9ZOn26q3gKm43fURHn0PzX+xIP04Zvj4DDI6/y4c8EtuIscWXIe +dgQ1t9S2DkCZWrKE+eAYu+v73gWDyuW0SpEVIozNgrzXLxTRpPUaQnlj9szW9lIW +aBphexFkAzszl8tHj26B6/10fzUm00Xu9JGWbdH7zNIvWgXQCGYyl9/ShGWVHXj1 +Otu1gLcrqn/F1R65ifbu9AAqXsVvT1n9ag888Y47PKxkMp36Ipv9mpe046snhVIq +o3TOoU5rjH4dILuVq7SbZ8YpH+wB+VVj8wOHZXlLjWrGprw75mAJSR8tpf0V93aE +t67piGTIyyO5SxDdZKIMX+yCBQJ1lf8AM6CmHW64BrnttTde3ZNxWJNaatf9uUuZ +QeofcRxbEBjzBn8KgTTRSqu1lO3A75u//yade9Eqaj+fXkIKdR2XUxfO4cbzUtcW +lObeu20FtIKAGXocPdIvsqOQfUA5A1BKhcX8VquC3vfqZ2nCj98= +=R+Z4 +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 43e897f..b059e54 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 21 19:12:06 UTC 2024 - Arjen de Korte + +- version update to 7.1.1.27 + https://github.com/ImageMagick/Website/blob/main/ChangeLog.md + ------------------------------------------------------------------- Tue Jan 16 14:54:49 UTC 2024 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 3908b9a..f58e480 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 26 +%define mfr_revision 27 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 From 63754881ad98f419cbdc695623d6a4e06801ff16b66137ed49d096be3e45e557 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 30 Jan 2024 16:21:32 +0000 Subject: [PATCH 09/12] OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=705 --- ImageMagick.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index f58e480..170718b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -96,13 +96,13 @@ BuildRequires: urw-base35-fonts BuildRequires: ghostscript-fonts-other BuildRequires: ghostscript-fonts-std %endif -Obsoletes: ImageMagick-config-7-SUSE < %{version} +Obsoletes: ImageMagick-config-7-SUSE < 7.1.1.27 Provides: ImageMagick-config-7-SUSE = %{version} -Obsoletes: ImageMagick-config-7-upstream -Obsoletes: ImageMagick-config-7-upstream-open -Obsoletes: ImageMagick-config-7-upstream-secure -Obsoletes: ImageMagick-config-7-upstream-websafe -Obsoletes: imagemagick-config-7-upstream-limited +Obsoletes: ImageMagick-config-7-upstream < 7.1.1.27 +Obsoletes: ImageMagick-config-7-upstream-open < 7.1.1.27 +Obsoletes: ImageMagick-config-7-upstream-secure < 7.1.1.27 +Obsoletes: ImageMagick-config-7-upstream-websafe < 7.1.1.27 +Obsoletes: imagemagick-config-7-upstream-limited < 7.1.1.27 %package -n perl-PerlMagick Summary: Perl interface for ImageMagick From 6747dce33584f922c911d35be0927998648aa685f590d3c4ed8f9e488c7e7a2e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 12 Feb 2024 08:41:43 +0000 Subject: [PATCH 10/12] Accepting request 1146033 from home:adkorte - version update to 7.1.1.28 https://github.com/ImageMagick/Website/blob/main/ChangeLog.md OBS-URL: https://build.opensuse.org/request/show/1146033 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=706 --- ImageMagick-7.1.1-27.tar.xz | 3 --- ImageMagick-7.1.1-27.tar.xz.asc | 16 ---------------- ImageMagick-7.1.1-28.tar.xz | 3 +++ ImageMagick-7.1.1-28.tar.xz.asc | 16 ++++++++++++++++ ImageMagick.changes | 6 ++++++ ImageMagick.spec | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 ImageMagick-7.1.1-27.tar.xz delete mode 100644 ImageMagick-7.1.1-27.tar.xz.asc create mode 100644 ImageMagick-7.1.1-28.tar.xz create mode 100644 ImageMagick-7.1.1-28.tar.xz.asc diff --git a/ImageMagick-7.1.1-27.tar.xz b/ImageMagick-7.1.1-27.tar.xz deleted file mode 100644 index b286e8c..0000000 --- a/ImageMagick-7.1.1-27.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca23eb8f980cccbc9ea1e1490edd0fb33699fd2283790378049a505809a2f7d0 -size 10564680 diff --git a/ImageMagick-7.1.1-27.tar.xz.asc b/ImageMagick-7.1.1-27.tar.xz.asc deleted file mode 100644 index e6fef86..0000000 --- a/ImageMagick-7.1.1-27.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmWtNpAACgkQiatj1IJ3 -N3o7iw//Wa2vM84g/pqHSVOgX0sgEUDFhwJVH57zWRylBsnElz07nNZo2ub3Jm9g -w4VI1hlgiNArcn+gbGwE0B1K2dATSY+5SAmS2OCbn33Z/2x0CAWV1ThPyT5Nc1BO -VG8qlrrtn0ucYmBh3xU03mhnnR5/GGhaL2yBkXoj0y5nQm/F/VuqvYUCr+LKzSLB -x3Ga+gIzeohgb9ZOn26q3gKm43fURHn0PzX+xIP04Zvj4DDI6/y4c8EtuIscWXIe -dgQ1t9S2DkCZWrKE+eAYu+v73gWDyuW0SpEVIozNgrzXLxTRpPUaQnlj9szW9lIW -aBphexFkAzszl8tHj26B6/10fzUm00Xu9JGWbdH7zNIvWgXQCGYyl9/ShGWVHXj1 -Otu1gLcrqn/F1R65ifbu9AAqXsVvT1n9ag888Y47PKxkMp36Ipv9mpe046snhVIq -o3TOoU5rjH4dILuVq7SbZ8YpH+wB+VVj8wOHZXlLjWrGprw75mAJSR8tpf0V93aE -t67piGTIyyO5SxDdZKIMX+yCBQJ1lf8AM6CmHW64BrnttTde3ZNxWJNaatf9uUuZ -QeofcRxbEBjzBn8KgTTRSqu1lO3A75u//yade9Eqaj+fXkIKdR2XUxfO4cbzUtcW -lObeu20FtIKAGXocPdIvsqOQfUA5A1BKhcX8VquC3vfqZ2nCj98= -=R+Z4 ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-28.tar.xz b/ImageMagick-7.1.1-28.tar.xz new file mode 100644 index 0000000..9063838 --- /dev/null +++ b/ImageMagick-7.1.1-28.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee4b6cdaaf2fa6020b6a3c6e055d993e970361a2fadf2bf2f984308b35c61915 +size 10614932 diff --git a/ImageMagick-7.1.1-28.tar.xz.asc b/ImageMagick-7.1.1-28.tar.xz.asc new file mode 100644 index 0000000..79c3cee --- /dev/null +++ b/ImageMagick-7.1.1-28.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmXI1QcACgkQiatj1IJ3 +N3q9shAArSbfUih034UlVrZj7+UjL71JaG8Ef9pkUuBIjf43xYLmrPMebOkm7Hse +p9yZkfuHv5h/hougLNQEERz+/dVOMw3eosBYIPWcjfQkdkleuxy7WNWggUxXz+Ag +xupckUDYyv9w0dabccf+yxQmYQLb+5qLwki5wCOunSUcAhxp1X4+qxSR2i1FnY7+ +Z6wnRiGN/JclBir5uDh/odXrouWARxRKwgpM2SrP3whsPdtYQTy1uGYlAaes/ZG5 +4C4iDQKqaH+ZcQPBT7ZilkGDP2YVF0h6g4AVx6YsXt/Otxnnynlb/RrM2HeV/iOF +orRCQhWo9K+yfhgKR0zKBDHKxiyUrvqjVh22TUf4gzg6eZo/YembXRnNV1ehB+4f +pRErWxd4daBv7VwEaCZnUXggrNNEFuljxO6KpiOgKTKMeCFMvaa1U7mYup5u2DEt +CntMSx1FTHQWUqiKz3s7LcoyLOoHztXAh1DOuzzJx9uX2EWOPKK/On9eqziiG0db +Hu49PRqYgVE8pAeGb2oJp2PjtGul/4UM5Xj49xdyoGUACyjoF1AcNIcS2DfUoM5w +txckXW75tO6o2xF9VXrAMHFiPOQ5kRvqAztPrTJBl0x1alAxXTa+6+KwB+Sofmd8 +XUdGNnUXvyk6gvxKP1V1dtYRNnXlNpPhtt0WqDr0Vxk+9MDgrfI= +=YGLv +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index b059e54..b275fbb 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 11 20:57:22 UTC 2024 - Arjen de Korte + +- version update to 7.1.1.28 + https://github.com/ImageMagick/Website/blob/main/ChangeLog.md + ------------------------------------------------------------------- Sun Jan 21 19:12:06 UTC 2024 - Arjen de Korte diff --git a/ImageMagick.spec b/ImageMagick.spec index 170718b..9b49453 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 27 +%define mfr_revision 28 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 From 49df3963d7c15e6c443188558c47d55c52cc86027817d8017443506d455eaf60 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 22 Feb 2024 08:02:24 +0000 Subject: [PATCH 11/12] - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=707 --- ImageMagick.changes | 5 +++++ ImageMagick.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ImageMagick.changes b/ImageMagick.changes index b275fbb..9dbc005 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 07:57:01 UTC 2024 - Michael Vetter + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sun Feb 11 20:57:22 UTC 2024 - Arjen de Korte diff --git a/ImageMagick.spec b/ImageMagick.spec index 9b49453..1d75cca 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -263,15 +263,15 @@ HTML documentation for ImageMagick library and scene examples. %prep %setup -q -n ImageMagick-%{source_version} -%patch0 -p1 -%patch2 -p1 +%patch -P 0 -p1 +%patch -P 2 -p1 %ifarch i586 %if %{?suse_version} < 1550 -%patch4 -p1 +%patch -P 4 -p1 %endif %endif %ifarch s390x -%patch5 -p1 +%patch -P 5 -p1 %endif %build From bbf5d848b4f1753ab9e5059e430e946372190a06f430a80197ab2f4aef99b73b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 28 Feb 2024 12:55:46 +0000 Subject: [PATCH 12/12] Accepting request 1152504 from home:adkorte - version update to 7.1.1.29 https://github.com/ImageMagick/Website/blob/main/ChangeLog.md OBS-URL: https://build.opensuse.org/request/show/1152504 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=708 --- ImageMagick-7.1.1-28.tar.xz | 3 --- ImageMagick-7.1.1-28.tar.xz.asc | 16 ---------------- ImageMagick-7.1.1-29.tar.xz | 3 +++ ImageMagick-7.1.1-29.tar.xz.asc | 16 ++++++++++++++++ ImageMagick.changes | 6 ++++++ ImageMagick.spec | 4 ++-- 6 files changed, 27 insertions(+), 21 deletions(-) delete mode 100644 ImageMagick-7.1.1-28.tar.xz delete mode 100644 ImageMagick-7.1.1-28.tar.xz.asc create mode 100644 ImageMagick-7.1.1-29.tar.xz create mode 100644 ImageMagick-7.1.1-29.tar.xz.asc diff --git a/ImageMagick-7.1.1-28.tar.xz b/ImageMagick-7.1.1-28.tar.xz deleted file mode 100644 index 9063838..0000000 --- a/ImageMagick-7.1.1-28.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee4b6cdaaf2fa6020b6a3c6e055d993e970361a2fadf2bf2f984308b35c61915 -size 10614932 diff --git a/ImageMagick-7.1.1-28.tar.xz.asc b/ImageMagick-7.1.1-28.tar.xz.asc deleted file mode 100644 index 79c3cee..0000000 --- a/ImageMagick-7.1.1-28.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmXI1QcACgkQiatj1IJ3 -N3q9shAArSbfUih034UlVrZj7+UjL71JaG8Ef9pkUuBIjf43xYLmrPMebOkm7Hse -p9yZkfuHv5h/hougLNQEERz+/dVOMw3eosBYIPWcjfQkdkleuxy7WNWggUxXz+Ag -xupckUDYyv9w0dabccf+yxQmYQLb+5qLwki5wCOunSUcAhxp1X4+qxSR2i1FnY7+ -Z6wnRiGN/JclBir5uDh/odXrouWARxRKwgpM2SrP3whsPdtYQTy1uGYlAaes/ZG5 -4C4iDQKqaH+ZcQPBT7ZilkGDP2YVF0h6g4AVx6YsXt/Otxnnynlb/RrM2HeV/iOF -orRCQhWo9K+yfhgKR0zKBDHKxiyUrvqjVh22TUf4gzg6eZo/YembXRnNV1ehB+4f -pRErWxd4daBv7VwEaCZnUXggrNNEFuljxO6KpiOgKTKMeCFMvaa1U7mYup5u2DEt -CntMSx1FTHQWUqiKz3s7LcoyLOoHztXAh1DOuzzJx9uX2EWOPKK/On9eqziiG0db -Hu49PRqYgVE8pAeGb2oJp2PjtGul/4UM5Xj49xdyoGUACyjoF1AcNIcS2DfUoM5w -txckXW75tO6o2xF9VXrAMHFiPOQ5kRvqAztPrTJBl0x1alAxXTa+6+KwB+Sofmd8 -XUdGNnUXvyk6gvxKP1V1dtYRNnXlNpPhtt0WqDr0Vxk+9MDgrfI= -=YGLv ------END PGP SIGNATURE----- diff --git a/ImageMagick-7.1.1-29.tar.xz b/ImageMagick-7.1.1-29.tar.xz new file mode 100644 index 0000000..53c8b48 --- /dev/null +++ b/ImageMagick-7.1.1-29.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685 +size 10612124 diff --git a/ImageMagick-7.1.1-29.tar.xz.asc b/ImageMagick-7.1.1-29.tar.xz.asc new file mode 100644 index 0000000..6022ef4 --- /dev/null +++ b/ImageMagick-7.1.1-29.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE2Ccu9R2iI+TQW0Zpiatj1IJ3N3oFAmXbWjgACgkQiatj1IJ3 +N3qSCA/+ONC4mKQXW6Ak2p4HAkIJz9iLu3MsiKfoPEATNaca+Iu0ud3Td1WYRQa4 +jG8xYlBMpQsAlgUT+Bj1VHNqACAt3j/Vd/1HVErydAxDEtwjIk6kM/+FDAEMa5u1 +aQsDlekd9HIA4tSZpEUtkQJaTrY5IvMClhwZvj5j9hOpKTlARO6qbVOCpmYdGGlW +Awa+nX98A6ftqBgxIa4cIuYcItNLAcpD0Tat9KKHiEY7IvxvajCSGHO5Pb0pLBny +UPd+Z6Ywpn8lBYSAtnYlm+0MPCgJVJwn8F6/4rJ39cMp2xWu9Eu5appTGSGbfbQf +ApNikiSjSlNdRbin6vmcJUXpaaKdZP5vB51qYokUhJuLwpsie3Ritl1HNZEEdqw4 +eJkeYZuQiLYX2HMudJ22UFj4k9SD1DPgjaJ9TR/eKyHsHDDmbJ8ql4IIuB7ss+wd +fTdPrCptDH9XM6xLzQ0CNTYNVw1GAjG8fVjCBJX9n1cGxg6qsfiWbvdLVTOvZN/R +z0vvRwLVTQy0z8EEl7lQD2FrRH8nQiGPXg8xq2rULB0ZRoeEsNT+sOBcUsgLk3hS +EPJqp/YjyPY60X+Hh8stZq6Yyn9wiMZcKQklyFj39i8fNgBbKEvfhHCSTdINyecc +Syk30ovTyHlKwIwDGTs8EwOphgkwLst3pB+Tfi6hdc5C7zaw7YY= +=Tg17 +-----END PGP SIGNATURE----- diff --git a/ImageMagick.changes b/ImageMagick.changes index 9dbc005..7bb1a94 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 27 20:28:12 UTC 2024 - Arjen de Korte + +- version update to 7.1.1.29 + https://github.com/ImageMagick/Website/blob/main/ChangeLog.md + ------------------------------------------------------------------- Thu Feb 22 07:57:01 UTC 2024 - Michael Vetter diff --git a/ImageMagick.spec b/ImageMagick.spec index 1d75cca..9cadf8b 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -20,7 +20,7 @@ %define asan_build 0 %define maj 7 %define mfr_version %{maj}.1.1 -%define mfr_revision 28 +%define mfr_revision 29 %define quantum_depth 16 %define source_version %{mfr_version}-%{mfr_revision} %define clibver 10 @@ -324,7 +324,7 @@ export CXXFLAGS="%{optflags} -O0" --enable-pipes=no \ --enable-reproducible-build=yes \ --disable-openmp \ - --with-security-policy=open # open for %check + --with-security-policy=open # open for %%check %if %{asan_build} sed -i -e 's/\(^CFLAGS.*\)/\1 -fsanitize=address/' \ -e 's/\(^LIBS =.*\)/\1 -lasan/' \