Hello community, here is the log from the commit of package ImageMagick for openSUSE:Factory checked in at Wed Apr 27 09:19:23 CEST 2011.
-------- --- ImageMagick/ImageMagick.changes 2011-04-11 15:29:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/ImageMagick/ImageMagick.changes 2011-04-22 00:42:27.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Apr 21 10:00:25 UTC 2011 - [email protected] + +- updated to 6.6.9.5: fixes [Bug 682238] + * macroized and cleaned up scripts + * added conditions for optional components + * updated file lists for upstream + * cleaned up the include tree in devel (patch) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ImageMagick-6.6.8-9.tar.bz2 New: ---- ImageMagick-6.6.9-5.tar.bz2 ImageMagick-6.6.9.1-inc-struct.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ImageMagick.spec ++++++ --- /var/tmp/diff_new_pack.Iu1tYV/_old 2011-04-27 09:19:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Iu1tYV/_new 2011-04-27 09:19:13.000000000 +0200 @@ -17,32 +17,92 @@ # norootforbuild +%bcond_with xtp +%bcond_without DCraw +%bcond_without FreeType +%bcond_without CXX +%bcond_without Ghostscript +%bcond_without LCMS +%bcond_without TIFF +%bcond_without WMF +%bcond_without XML +%bcond_without DejaVu +%bcond_without EXIF +%bcond_without JPEG Name: ImageMagick -BuildRequires: dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std -BuildRequires: ghostscript-library liblcms-devel libtiff-devel libwmf-devel -BuildRequires: libxml2-devel pkgconfig -BuildRequires: fdupes libdjvulibre-devel libexif-devel libjasper-devel -Obsoletes: imagemag -Provides: imagemag + +BuildRequires: fdupes pkgconfig + +%if %{with DCraw} +BuildRequires: dcraw +%endif + +%if %{with FreeType} +BuildRequires: freetype2-devel +%endif + +%if %{with CXX} +BuildRequires: gcc-c++ +%endif + +%if %{with Ghostscript} +BuildRequires: ghostscript-fonts-other ghostscript-fonts-std ghostscript-library +%endif + +%if %{with LCMS} +BuildRequires: liblcms-devel +%endif + +%if %{with TIFF} +BuildRequires: libtiff-devel +%endif + +%if %{with WMF} +BuildRequires: libwmf-devel +%endif + +%if %{with XML} +BuildRequires: libxml2-devel +%endif + +%if %{with DejaVu} +BuildRequires: libdjvulibre-devel +%endif + +%if %{with EXIF} +BuildRequires: libexif-devel +%endif + +%if %{with JPEG} +BuildRequires: libjasper-devel +%endif + %define xtp_version 5.4.3 +%define mfr_version 6.6.9 +%define mfr_revision 5 +%define source_version %{mfr_version}-%{mfr_revision} License: Public Domain, Freeware Group: Productivity/Graphics/Other AutoReqProv: on -Version: 6.6.8.9 +Version: %{mfr_version}.%{mfr_revision} Release: 1 -%define source_version 6.6.8-9 %define libver 4 Summary: Viewer and Converter for Images Url: http://www.imagemagick.org -Source: ImageMagick-%{source_version}.tar.bz2 +Source: ImageMagick-6.6.9-5.tar.bz2 # To get mtime of file Source1: ImageMagick.changes +%if %{with xtp} Source2: xtp-%{xtp_version}.tar.bz2 +%endif Source3: baselibs.conf -Patch1: ImageMagick-%{version}-examples.patch -Patch2: ImageMagick-%{version}-doc.patch +Patch1: ImageMagick-6.6.8.9-examples.patch +Patch2: ImageMagick-6.6.8.9-doc.patch +Patch3: ImageMagick-6.6.9.1-inc-struct.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: imagemag = %{version} +Obsoletes: imagemag < %{version} %package -n perl-PerlMagick License: Public Domain, Freeware @@ -88,39 +148,48 @@ License: PERMISSIVE-OSI-COMPLIANT -Requires: ImageMagick = %{version} +Requires: ImageMagick Summary: C++ Interface for ImageMagick - runtime library Group: Development/Libraries/C and C++ AutoReqProv: on # was last used in openSUSE 10.2 -Provides: ImageMagick-Magick++ = 6.3.3 -Obsoletes: ImageMagick-Magick++ <= 6.3.3 +Provides: ImageMagick-Magick++ = %{version} +Obsoletes: ImageMagick-Magick++ < %{version} %package -n libMagick++-devel License: PERMISSIVE-OSI-COMPLIANT Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{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} +Provides: ImageMagick-Magick++-devel = %{version} +Obsoletes: ImageMagick-Magick++-devel < %{version} AutoReqProv: on %package doc License: PERMISSIVE-OSI-COMPLIANT Summary: Document Files for ImageMagick Library Group: Development/Libraries/C and C++ -Requires: ImageMagick = %{version} %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %prep rm -rf xtp-%{xtp_version} +%if %{with xtp} %setup -n ImageMagick-%{source_version} -b 2 +%else +%setup -n ImageMagick-%{source_version} +%endif %patch1 %patch2 +%patch3 -p1 +echo>header-test.c '#include "wand.h"' +echo>wand.h '#include "wand/MagickWand.h"' +%{__make} header-test.o %build +%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all +%define LDFLAGS -L%{_libdir} -fuse-linker-plugin %define system_ltdl 0 %if %system_ltdl cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl @@ -132,37 +201,36 @@ sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh autoreconf --force --install -v + +%if %{with xtp} pushd ../xtp-%{xtp_version} autoreconf --force --install popd -export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" -export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" -%if %suse_version <= 1030 +%endif + +%if %{suse_version} <= 1030 # openmp does not work with perl module OPENMP="--disable-openmp" %endif -export LDFLAGS="-L%{_libdir}" %configure \ --enable-shared \ --without-frozenpaths \ - --with-largefiles \ --with-magick_plus_plus \ --with-modules \ --with-threads \ --without-perl \ --disable-static \ - --enable-libtool-verbose \ - --with-djvu=yes $OPENMP + --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" make %{?jobs:-j%jobs} all cd PerlMagick perl Makefile.PL make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" # +%if %{with xtp} cd ../../xtp-%{xtp_version} -export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -export CXXFLAGS="$RPM_OPT_FLAGS" -%configure +%configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}" make %{?jobs:-j%jobs} +%endif %check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs @@ -173,35 +241,39 @@ make test %install -install -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/images -make install \ +%{__install} -d "${RPM_BUILD_ROOT%}"'{_defaultdocdir}/%{name}/images' +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ pkgdocdir=%{_defaultdocdir}/%{name}/ -install -m 644 ChangeLog QuickStart.txt README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ cd PerlMagick -make DESTDIR=$RPM_BUILD_ROOT LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" install_vendor +%{__make} "DESTDIR=${RPM_BUILD_ROOT}" 'LD_RUN_PATH=%{_libdir}:%{_prefix}/X11R6/%{_lib}' install_vendor %perl_process_packlist -cd ../Magick++ - rm -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} `find demo -type f -perm +111` - mv demo/makefile.2 demo/Makefile +cd '../Magick++' + %{__rm} -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} + PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';' + %{__mv} demo/makefile.2 demo/Makefile cd .. + +%if %{with xtp} pushd ../xtp-%{xtp_version} - make DESTDIR=$RPM_BUILD_ROOT install - install -m 644 README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README-xtp.txt + %{__make} DESTDIR=$RPM_BUILD_ROOT install popd -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" -rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%endif + +%{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml +%{__cp} -a -t "${RPM_BUILD_ROOT}"'%{_defaultdocdir}/%{name}/' scenes +PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \ + -execdir %{__sed} -i -e 's@ -L/usr/src[^ ]*@@g' -e 's@ /usr/lib/libltdl.la@@g' '{}' ';' +%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/libltdl.* +%{__rm} -f "${RPM_BUILD_ROOT}"'%{_libdir}'/*.la +echo>'%{buildroot}%{_includedir}/%{name}/wand.h' '#include "wand/MagickWand.h"' %if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand -%fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api +%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand +%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api %endif %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %post -n libMagickCore%{libver} -p /sbin/ldconfig @@ -218,14 +290,18 @@ %files %defattr(-,root,root) %docdir %{_docdir}/%{name} -%{_docdir}/%{name}/*.txt -%{_docdir}/%{name}/ChangeLog -%{_docdir}/%{name}/LICENSE +%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE +%define mfr_docdir %{_defaultdocdir}/../%{name}-%{mfr_version}/packages/%{name}/ +%exclude %{mfr_docdir}ChangeLog +%exclude %{mfr_docdir}LICENSE +%exclude %{mfr_docdir}NEWS.txt %{_bindir}/[^MW]* %doc %{_mandir}/man1/* +%exclude %{_mandir}/man1/*-config.1.gz %files -n libMagickCore%{libver} %defattr(-,root,root) +%doc LICENSE %dir %{_sysconfdir}/ImageMagick* %config %{_sysconfdir}/ImageMagick*/* %{_libdir}/libMagickCore.so.%{libver}* @@ -241,10 +317,12 @@ %files -n libMagickWand%{libver} %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagickWand.so.%{libver}* %files extra %defattr(-,root,root) +%doc LICENSE %{_libdir}/ImageMagick*/modules*/*/wmf.so # don't remove la files, see bnc#579798 %{_libdir}/ImageMagick*/modules*/*/wmf.la @@ -255,11 +333,13 @@ %files devel %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagickCore.so %{_libdir}/libMagickWand.so %dir %{_includedir}/ImageMagick %{_includedir}/ImageMagick/magick %{_includedir}/ImageMagick/wand +%{_includedir}/ImageMagick/wand.h %{_bindir}/MagickCore-config %{_bindir}/MagickWand-config %{_bindir}/Magick-config @@ -268,9 +348,12 @@ %{_libdir}/pkgconfig/Wand.pc %{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/MagickWand.pc +%doc %{_mandir}/man1/*-config.1.gz +%exclude %{_mandir}/man1/Magick++-config.1.gz %files -n perl-PerlMagick %defattr(-,root,root) +%doc LICENSE %doc PerlMagick/README.txt %doc PerlMagick/demo %if %suse_version < 1140 @@ -282,10 +365,12 @@ %files -n libMagick++%{libver} %defattr(-,root,root) +%doc LICENSE %{_libdir}/libMagick++.so.%{libver}* %files -n libMagick++-devel %defattr(-,root,root) +%doc LICENSE %doc Magick++/demo %doc Magick++/NEWS Magick++/README Magick++/AUTHORS %{_libdir}/libMagick++.so @@ -294,14 +379,17 @@ %{_bindir}/Magick++-config %{_libdir}/pkgconfig/ImageMagick++.pc %{_libdir}/pkgconfig/Magick++.pc +%doc %{_mandir}/man1/Magick++-config.1.gz %files doc %defattr(-,root,root) %dir %{_docdir}/%{name} +%if 0 %{_docdir}/%{name}/index.html %{_docdir}/%{name}/www %{_docdir}/%{name}/images %{_docdir}/%{name}/scenes +%endif %description ImageMagick is a robust collection of tools and libraries to read, ++++++ ImageMagick-6.6.8-9.tar.bz2 -> ImageMagick-6.6.9-5.tar.bz2 ++++++ ImageMagick/ImageMagick-6.6.8-9.tar.bz2 /mounts/work_src_done/STABLE/ImageMagick/ImageMagick-6.6.9-5.tar.bz2 differ: char 11, line 1 ++++++ ImageMagick-6.6.9.1-inc-struct.diff ++++++ ++++ 1044 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
