- 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
This commit is contained in:
Petr Gajdos 2011-04-11 13:29:04 +00:00 committed by Git OBS Bridge
parent 7be9532d7b
commit 3066db322b
7 changed files with 29 additions and 23 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c156a20dfe2f7819d51ba6ea19faae96d1617abb7c08c055d3ce5ddd27700985
size 10132009

View File

@ -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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f29ce00b4ad3c850f462900c9df3c87aaed19199647bedda3db7945dd4b2b8ca
size 10089422

View File

@ -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

View File

@ -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

View File

@ -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*