OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=5

ImageMagick-6.3.3-8.tar.bz2

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

ImageMagick-6.3.5-3.tar.bz2

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

ImageMagick.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jul 25 17:31:33 CEST 2007 - nadvornik@suse.cz
+
+- updated to 6.3.5-3, see ChangeLog for details
+- reduced the requrements of the main package, 
+  created ImageMagick-extra with full set of requirements
+- adjusted to Shared Library Policy:
+  * created libMagick10 and libWand10
+  * renamed ImageMagick-Magick++ -> libMagick++10
+  * renamed ImageMagick-Magick++-devel -> libMagick++-devel
+
 -------------------------------------------------------------------
 Thu Apr 19 13:53:08 CEST 2007 - nadvornik@suse.cz
 

ImageMagick.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package ImageMagick (Version 6.3.3.8)
+# spec file for package ImageMagick (Version 6.3.5.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
 
 Name:           ImageMagick
 BuildRequires:  dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std
-BuildRequires:  ghostscript-library glib liblcms-devel libtiff-devel libwmf-devel
+BuildRequires:  ghostscript-library glib libdjvulibre-devel liblcms-devel libtiff-devel libwmf-devel
 BuildRequires:  libxml2-devel pkgconfig
 %if %suse_version > 1020
 BuildRequires:  libexif-devel libjasper-devel
@@ -24,44 +24,60 @@ Provides:       imagemag
 %define xtp_version 5.4.3
 %define prefix /usr
 %define perl_prefix /usr
-License:        Any permissive
+License:        Any permissive, http://www.imagemagick.org/script/license.php
 Group:          Productivity/Graphics/Other
 Autoreqprov:    on
-Version:        6.3.3.8
+Version:        6.3.5.3
 Release:        1
 Summary:        Viewer and Converter for Images
 URL:            http://www.imagemagick.org
-Source:         ImageMagick-6.3.3-8.tar.bz2
+Source:         ImageMagick-6.3.5-3.tar.bz2
 Source2:        xtp-%{xtp_version}.tar.bz2
 Patch1:         ImageMagick-%{version}-examples.patch
 Patch2:         ImageMagick-%{version}-doc.patch
 Patch3:         ImageMagick-%{version}-autoconf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %package -n perl-PerlMagick
-Requires:       perl = %{perl_version}
+Requires:       perl = %{perl_version} ImageMagick = %{version}
 Summary:        Perl interface for ImageMagick
 Group:          Development/Libraries/Perl
 Autoreqprov:    on
 %package devel
-Requires:       ImageMagick = %{version} libtiff-devel libjpeg-devel liblcms-devel freetype2-devel xorg-x11-devel libpng-devel bzip2 libxml2-devel libjasper libwmf-devel
+Requires:       ImageMagick = %{version} libMagick10 = %{version} libtiff-devel libjpeg-devel liblcms-devel freetype2-devel xorg-x11-devel libpng-devel bzip2 libxml2-devel libjasper libwmf-devel
 Summary:        Include Files and Libraries Mandatory for Development.
 Group:          Development/Libraries/C and C++
 Autoreqprov:    on
-%package Magick++
+%package extra
+Requires:       ImageMagick = %{version} libMagick10 = %{version}
+Summary:        Viewer and Converter for Images
+Group:          Productivity/Graphics/Other
+#delegates configured in delegates.xml that imagemagick can use
+Recommends:     autotrace dcraw transfig ghostscript_any hp2xx netpbm ghostpcl libwmf
+Autoreqprov:    on
+%package -n libMagick10
+Summary:        Viewer and Converter for Images
+Group:          Productivity/Graphics/Other
+Suggests:       ImageMagick-extra = %{version}
+Autoreqprov:    on
+%package -n libWand10
+Summary:        Viewer and Converter for Images
+Group:          Productivity/Graphics/Other
+Autoreqprov:    on
+%package -n libMagick++10
 Requires:       ImageMagick = %{version}
-Obsoletes:      magickpp
-Provides:       magickpp
 Summary:        C++ Interface for ImageMagick - runtime library
 Group:          Development/Libraries/C and C++
 Autoreqprov:    on
-%package Magick++-devel
+%package -n libMagick++-devel
-Requires:       ImageMagick-Magick++ = %{version} ImageMagick-devel = %{version} libstdc++-devel
+Requires:       ImageMagick-Magick++ = %{version} ImageMagick-devel = %{version} libMagick++10 = %{version} libstdc++-devel
 Summary:        C++ Interface for ImageMagick - files mandatory for development
 Group:          Development/Libraries/C and C++
+Provides:       ImageMagick-Magick++-devel
+Obsoletes:      ImageMagick-Magick++-devel <= %{version}
 Autoreqprov:    on
 %prep
 rm -rf xtp-%{xtp_version}
-%setup -n ImageMagick-6.3.3 -b 2
+%setup -n ImageMagick-6.3.5 -b 2
 %patch1
 %patch2
 %patch3
@@ -84,7 +100,9 @@ export LDFLAGS="-L%{_libdir}"
 ./configure --prefix=%{prefix} --libdir=%{_libdir} \
          --mandir=%{_mandir} --enable-shared --without-frozenpaths \
 	 --with-largefiles  --with-magick_plus_plus --with-modules\
-	 --with-threads --without-perl --disable-static
+	 --with-threads --without-perl --disable-static --disable-openmp \
+	 --enable-libtool-verbose
+# openmp does not work with perl module
 make %{?jobs:-j%jobs} all
 cd PerlMagick
 perl Makefile.PL
@@ -120,46 +138,68 @@ rmdir $RPM_BUILD_ROOT/usr/share/ImageMagick*/config
 mv -f $RPM_BUILD_ROOT/usr/share/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" 
-rm -f $RPM_BUILD_ROOT/usr/%_lib/libltdl.*
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libltdl.*
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -n libMagick10
 %run_ldconfig
 
-%postun
+%postun -n libMagick10
 %run_ldconfig
 
-%post Magick++
+%post -n libWand10
 %run_ldconfig
 
-%postun Magick++
+%postun -n libWand10
+%run_ldconfig
+
+%post -n libMagick++10
+%run_ldconfig
+
+%postun -n libMagick++10
 %run_ldconfig
 
 %files
 %defattr(-,root,root)
 %docdir %{_defaultdocdir}/%{name}
 %{_defaultdocdir}/%{name}
+%{prefix}/bin/[^MW]*
+%doc %{_mandir}/man1/*
+
+%files -n libMagick10
+%defattr(-,root,root)
 %dir %{_libdir}/ImageMagick*/config
 %config %{_libdir}/ImageMagick*/config/*
-%{prefix}/bin/[^MW]*
+%{_libdir}/libMagick.so.10*
-%{_libdir}/libMagick.so.*
-%{_libdir}/libWand.so.*
-%doc %{_mandir}/man1/*
-#
 %dir %{_libdir}/ImageMagick*
 %dir %{_libdir}/ImageMagick*/modules*
 %dir %{_libdir}/ImageMagick*/modules*/*
+%exclude %{_libdir}/ImageMagick*/modules*/*/wmf.*
+%exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
+%exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
 %{_libdir}/ImageMagick*/modules*/*/*.so
 %{_libdir}/ImageMagick*/modules*/*/*.la
 
+%files -n libWand10
+%defattr(-,root,root)
+%{_libdir}/libWand.so.10*
+
+%files extra
+%defattr(-,root,root)
+%{_libdir}/ImageMagick*/modules*/*/wmf.so
+%{_libdir}/ImageMagick*/modules*/*/wmf.la
+%{_libdir}/ImageMagick*/modules*/*/jp2.so
+%{_libdir}/ImageMagick*/modules*/*/jp2.la
+%{_libdir}/ImageMagick*/modules*/*/djvu.so
+%{_libdir}/ImageMagick*/modules*/*/djvu.la
+
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libMagick.so
-%{_libdir}/libMagick.la
 %{_libdir}/libWand.so
-%{_libdir}/libWand.la
 %{prefix}/include/magick
 %{prefix}/include/wand
 %{prefix}/bin/Magick-config
@@ -176,16 +216,15 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Image
 %{perl_vendorarch}/Image
 
-%files Magick++
+%files -n libMagick++10
 %defattr(-,root,root)
-%doc Magick++/NEWS Magick++/README Magick++/AUTHORS Magick++/COPYING
 %{_libdir}/libMagick++.so.*
 
-%files Magick++-devel
+%files -n libMagick++-devel
 %defattr(-,root,root)
 %doc Magick++/demo
+%doc Magick++/NEWS Magick++/README Magick++/AUTHORS Magick++/COPYING
 %{_libdir}/libMagick++.so
-%{_libdir}/libMagick++.la
 %{prefix}/include/Magick++.h
 %{prefix}/include/Magick++
 %{prefix}/bin/Magick++-config
@@ -222,6 +261,60 @@ interfaces.
 
 
 
+Authors:
+--------
+    John Cristy <cristy@dupont.com>
+
+
+%description extra
+ImageMagick is a robust collection of tools and libraries to read,
+write, and manipulate an image in many image formats, including popular
+formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick,
+you can create images dynamically, making it suitable for Web
+applications. You can also resize, rotate, sharpen, color-reduce, or
+add special effects to an image and save your completed work in many
+different image formats. Image processing operations are available from
+the command line as well as through C, C++, and PERL-based programming
+interfaces.
+
+
+
+Authors:
+--------
+    John Cristy <cristy@dupont.com>
+
+
+%description -n libMagick10
+ImageMagick is a robust collection of tools and libraries to read,
+write, and manipulate an image in many image formats, including popular
+formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick,
+you can create images dynamically, making it suitable for Web
+applications. You can also resize, rotate, sharpen, color-reduce, or
+add special effects to an image and save your completed work in many
+different image formats. Image processing operations are available from
+the command line as well as through C, C++, and PERL-based programming
+interfaces.
+
+
+
+Authors:
+--------
+    John Cristy <cristy@dupont.com>
+
+
+%description -n libWand10
+ImageMagick is a robust collection of tools and libraries to read,
+write, and manipulate an image in many image formats, including popular
+formats like TIFF, JPEG, PNG, PDF, PhotoCD, and GIF. With ImageMagick,
+you can create images dynamically, making it suitable for Web
+applications. You can also resize, rotate, sharpen, color-reduce, or
+add special effects to an image and save your completed work in many
+different image formats. Image processing operations are available from
+the command line as well as through C, C++, and PERL-based programming
+interfaces.
+
+
+
 Authors:
 --------
     John Cristy <cristy@dupont.com>
@@ -241,7 +334,7 @@ Authors:
     John Cristy <cristy@dupont.com>
 
 
-%description Magick++
+%description -n libMagick++10
 This is Magick++, the object-oriented C++ API for the ImageMagick
 image-processing library.
 
@@ -263,7 +356,7 @@ Authors:
     Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
 
-%description Magick++-devel
+%description -n libMagick++-devel
 This is Magick++, the object-oriented C++ API for the ImageMagick
 image-processing library.
 
@@ -286,6 +379,14 @@ Authors:
 
 
 %changelog
+* Wed Jul 25 2007 - nadvornik@suse.cz
+- updated to 6.3.5-3, see ChangeLog for details
+- reduced the requrements of the main package,
+  created ImageMagick-extra with full set of requirements
+- adjusted to Shared Library Policy:
+  * created libMagick10 and libWand10
+  * renamed ImageMagick-Magick++ -> libMagick++10
+  * renamed ImageMagick-Magick++-devel -> libMagick++-devel
 * Thu Apr 19 2007 - nadvornik@suse.cz
 - updated to 6.3.3-8, see ChangeLog for details
 - fixed various crashes on malformed input, including