From 7be9532d7b588b6809745dc014712c6b15b7d4c8c284c75e37c7c30bcc800a80 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 24 Feb 2011 08:01:09 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/ImageMagick revision 55.0 OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=c3b0a07fb6e20d5635e4a25e5e2d7eec --- ImageMagick.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index e22f3b4..5738dc7 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -30,7 +30,7 @@ License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on Version: 6.6.7.9 -Release: 3 +Release: 1 %define source_version 6.6.7-9 %define libver 4 Summary: Viewer and Converter for Images From 3066db322baa875dcd91b0a9cf6dcc3fb4748963597e85bb94b209d952035b49 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 11 Apr 2011 13:29:04 +0000 Subject: [PATCH 2/2] - updated to 6.6.8.9: fixes [bnc#682238] * config files moved to /etc/ImageMagick* * see ChangeLog for more details OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=60 --- ImageMagick-6.6.7-9.tar.bz2 | 3 --- ImageMagick-6.6.7.9-doc.patch | 13 ------------- ImageMagick-6.6.8-9.tar.bz2 | 3 +++ ImageMagick-6.6.8.9-doc.patch | 13 +++++++++++++ ...ples.patch => ImageMagick-6.6.8.9-examples.patch | 0 ImageMagick.changes | 7 +++++++ ImageMagick.spec | 13 ++++++------- 7 files changed, 29 insertions(+), 23 deletions(-) delete mode 100644 ImageMagick-6.6.7-9.tar.bz2 delete mode 100644 ImageMagick-6.6.7.9-doc.patch create mode 100644 ImageMagick-6.6.8-9.tar.bz2 create mode 100644 ImageMagick-6.6.8.9-doc.patch rename ImageMagick-6.6.7.9-examples.patch => ImageMagick-6.6.8.9-examples.patch (100%) diff --git a/ImageMagick-6.6.7-9.tar.bz2 b/ImageMagick-6.6.7-9.tar.bz2 deleted file mode 100644 index d4bdbcb..0000000 --- a/ImageMagick-6.6.7-9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c156a20dfe2f7819d51ba6ea19faae96d1617abb7c08c055d3ce5ddd27700985 -size 10132009 diff --git a/ImageMagick-6.6.7.9-doc.patch b/ImageMagick-6.6.7.9-doc.patch deleted file mode 100644 index a64a2a1..0000000 --- a/ImageMagick-6.6.7.9-doc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -2544,7 +2544,7 @@ AC_SUBST(FILTER_PATH) - - # - # Path to ImageMagick documentation files --DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" -+DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}" - DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}" - DEFINE_DOCUMENTATION_PATH="${DATA_DIR}/doc/${DOCUMENTATION_RELATIVE_PATH}/" - case "${build_os}" in diff --git a/ImageMagick-6.6.8-9.tar.bz2 b/ImageMagick-6.6.8-9.tar.bz2 new file mode 100644 index 0000000..34a16cd --- /dev/null +++ b/ImageMagick-6.6.8-9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f29ce00b4ad3c850f462900c9df3c87aaed19199647bedda3db7945dd4b2b8ca +size 10089422 diff --git a/ImageMagick-6.6.8.9-doc.patch b/ImageMagick-6.6.8.9-doc.patch new file mode 100644 index 0000000..a43d6f7 --- /dev/null +++ b/ImageMagick-6.6.8.9-doc.patch @@ -0,0 +1,13 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -2751,7 +2751,7 @@ AC_SUBST(FILTER_PATH) + + # + # Path to ImageMagick documentation files +-DOCUMENTATION_RELATIVE_PATH="" ++DOCUMENTATION_RELATIVE_PATH="packages/${PACKAGE_NAME}" + DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" + DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" + case "${build_os}" in diff --git a/ImageMagick-6.6.7.9-examples.patch b/ImageMagick-6.6.8.9-examples.patch similarity index 100% rename from ImageMagick-6.6.7.9-examples.patch rename to ImageMagick-6.6.8.9-examples.patch diff --git a/ImageMagick.changes b/ImageMagick.changes index b2b053f..4c65f5a 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 11 15:28:24 CEST 2011 - pgajdos@suse.cz + +- updated to 6.6.8.9: fixes [bnc#682238] + * config files moved to /etc/ImageMagick* + * see ChangeLog for more details + ------------------------------------------------------------------- Wed Feb 23 20:14:56 CET 2011 - pgajdos@suse.cz diff --git a/ImageMagick.spec b/ImageMagick.spec index 5738dc7..6d5289c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -29,9 +29,9 @@ Provides: imagemag License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.7.9 -Release: 1 -%define source_version 6.6.7-9 +Version: 6.6.8.9 +Release: 3 +%define source_version 6.6.8-9 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org @@ -189,8 +189,7 @@ pushd ../xtp-%{xtp_version} make DESTDIR=$RPM_BUILD_ROOT install install -m 644 README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README-xtp.txt popd -mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config/* $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/config -rmdir $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config +mv $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/ImageMagick* mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ cp -a scenes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ find $RPM_BUILD_ROOT/%{_libdir} -name "*.la" -print0 | xargs -0 -r perl -spi -e "s@ -L/usr/src[^ ]*@@g;s@ /usr/lib/libltdl.la@@g" @@ -227,8 +226,8 @@ rm -rf $RPM_BUILD_ROOT %files -n libMagickCore%{libver} %defattr(-,root,root) -%dir %{_libdir}/ImageMagick*/config -%config %{_libdir}/ImageMagick*/config/* +%dir %{_sysconfdir}/ImageMagick* +%config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore.so.%{libver}* %dir %{_libdir}/ImageMagick* %dir %{_libdir}/ImageMagick*/modules*