Updating link to change in openSUSE:Factory/ImageMagick revision 29.0

OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=7c90809523f2f64e5784d5a84bbe1fc0
This commit is contained in:
OBS User buildservice-autocommit 2010-02-11 18:41:27 +00:00 committed by Git OBS Bridge
parent 3e56222193
commit ba08a5a55b
2 changed files with 48 additions and 41 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 9 15:03:34 UTC 2010 - prusnak@suse.cz
- build -doc subpackage as noarch
- spec cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 11 15:13:29 CET 2010 - pgajdos@suse.cz Mon Jan 11 15:13:29 CET 2010 - pgajdos@suse.cz

View File

@ -26,13 +26,11 @@ BuildRequires: fdupes libdjvulibre-devel libexif-devel libjasper-devel
Obsoletes: imagemag Obsoletes: imagemag
Provides: imagemag Provides: imagemag
%define xtp_version 5.4.3 %define xtp_version 5.4.3
%define prefix /usr
%define perl_prefix /usr
License: PERMISSIVE-OSI-COMPLIANT License: PERMISSIVE-OSI-COMPLIANT
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
AutoReqProv: on AutoReqProv: on
Version: 6.5.8.9 Version: 6.5.8.9
Release: 1 Release: 2
%define source_version 6.5.8-9 %define source_version 6.5.8-9
Summary: Viewer and Converter for Images Summary: Viewer and Converter for Images
Url: http://www.imagemagick.org Url: http://www.imagemagick.org
@ -103,6 +101,9 @@ License: PERMISSIVE-OSI-COMPLIANT
Summary: Document Files for ImageMagick Library Summary: Document Files for ImageMagick Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: ImageMagick = %{version} Requires: ImageMagick = %{version}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%prep %prep
rm -rf xtp-%{xtp_version} rm -rf xtp-%{xtp_version}
@ -113,7 +114,7 @@ rm -rf xtp-%{xtp_version}
%build %build
%define system_ltdl 0 %define system_ltdl 0
%if %system_ltdl %if %system_ltdl
cp -f /usr/share/libtool/libltdl/*.{c,h} ltdl cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl
mv ltdl/ltdl.c ltdl/ltdl.c.orig mv ltdl/ltdl.c ltdl/ltdl.c.orig
sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c sed -e "s:<config.h>:<magick/magick-config.h>:" ltdl/ltdl.c.orig >ltdl/ltdl.c
%endif %endif
@ -128,20 +129,26 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
OPENMP="--disable-openmp" OPENMP="--disable-openmp"
%endif %endif
export LDFLAGS="-L%{_libdir}" export LDFLAGS="-L%{_libdir}"
./configure --prefix=%{prefix} --libdir=%{_libdir} \ %configure \
--mandir=%{_mandir} --enable-shared --without-frozenpaths \ --enable-shared \
--with-largefiles --with-magick_plus_plus --with-modules\ --without-frozenpaths \
--with-threads --without-perl --disable-static \ --with-largefiles \
--enable-libtool-verbose --with-djvu=yes $OPENMP --with-magick_plus_plus \
--with-modules \
--with-threads \
--without-perl \
--disable-static \
--enable-libtool-verbose \
--with-djvu=yes $OPENMP
make %{?jobs:-j%jobs} all make %{?jobs:-j%jobs} all
cd PerlMagick cd PerlMagick
perl Makefile.PL perl Makefile.PL
make %{?jobs:-j%jobs} LD_RUN_PATH="/usr/%{_lib}:/usr/X11R6/%{_lib}" make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
# #
cd ../../xtp-%{xtp_version} cd ../../xtp-%{xtp_version}
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"
./configure --prefix=%{prefix} --libdir=%{_libdir} --mandir=%{_mandir} %configure
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
%check %check
@ -153,16 +160,14 @@ cd PerlMagick
make test make test
%install %install
install -d $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/images install -d $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/images
make install \ make install \
DESTDIR=$RPM_BUILD_ROOT \ DESTDIR=$RPM_BUILD_ROOT \
pkgdocdir=%{_defaultdocdir}/%{name}/ pkgdocdir=%{_defaultdocdir}/%{name}/
install -m 644 ChangeLog \ install -m 644 ChangeLog QuickStart.txt README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
QuickStart.txt README.txt \
$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/
cd PerlMagick cd PerlMagick
make DESTDIR=$RPM_BUILD_ROOT LD_RUN_PATH="/usr/%{_lib}:/usr/X11R6/%{_lib}" install_vendor make DESTDIR=$RPM_BUILD_ROOT LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}" install_vendor
%perl_process_packlist %perl_process_packlist
cd ../Magick++ cd ../Magick++
rm -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} `find demo -type f -perm +111` rm -rf demo/{.deps,.libs,*.C,*.o,Makefile*,run_demos.bat} `find demo -type f -perm +111`
mv demo/makefile.2 demo/Makefile mv demo/makefile.2 demo/Makefile
@ -170,16 +175,16 @@ cd ..
pushd ../xtp-%{xtp_version} pushd ../xtp-%{xtp_version}
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
popd popd
mv -f $RPM_BUILD_ROOT/usr/share/ImageMagick*/config/* $RPM_BUILD_ROOT/%{_libdir}/ImageMagick*/config mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config/* $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/config
rmdir $RPM_BUILD_ROOT/usr/share/ImageMagick*/config rmdir $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/config
mv -f $RPM_BUILD_ROOT/usr/share/ImageMagick*/* $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
cp -a scenes $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}/libltdl.* rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/ImageMagick*/modules*/*/*.la
%if 0%{?suse_version} > 1020 %if 0%{?suse_version} > 1020
%fdupes $RPM_BUILD_ROOT/usr/include/ImageMagick/wand %fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand
%fdupes $RPM_BUILD_ROOT/usr/share/doc/packages/ImageMagick/www/api %fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api
%endif %endif
%clean %clean
@ -203,7 +208,7 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/%{name}/*.txt %{_docdir}/%{name}/*.txt
%{_docdir}/%{name}/ChangeLog %{_docdir}/%{name}/ChangeLog
%{_docdir}/%{name}/LICENSE %{_docdir}/%{name}/LICENSE
%{prefix}/bin/[^MW]* %{_bindir}/[^MW]*
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%files -n libMagickCore2 %files -n libMagickCore2
@ -218,7 +223,6 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_libdir}/ImageMagick*/modules*/*/jp2.* %exclude %{_libdir}/ImageMagick*/modules*/*/jp2.*
%exclude %{_libdir}/ImageMagick*/modules*/*/djvu.* %exclude %{_libdir}/ImageMagick*/modules*/*/djvu.*
%{_libdir}/ImageMagick*/modules*/*/*.so %{_libdir}/ImageMagick*/modules*/*/*.so
%{_libdir}/ImageMagick*/modules*/*/*.la
%files -n libMagickWand2 %files -n libMagickWand2
%defattr(-,root,root) %defattr(-,root,root)
@ -227,23 +231,20 @@ rm -rf $RPM_BUILD_ROOT
%files extra %files extra
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/ImageMagick*/modules*/*/wmf.so %{_libdir}/ImageMagick*/modules*/*/wmf.so
%{_libdir}/ImageMagick*/modules*/*/wmf.la
%{_libdir}/ImageMagick*/modules*/*/jp2.so %{_libdir}/ImageMagick*/modules*/*/jp2.so
%{_libdir}/ImageMagick*/modules*/*/jp2.la
%{_libdir}/ImageMagick*/modules*/*/djvu.so %{_libdir}/ImageMagick*/modules*/*/djvu.so
%{_libdir}/ImageMagick*/modules*/*/djvu.la
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libMagickCore.so %{_libdir}/libMagickCore.so
%{_libdir}/libMagickWand.so %{_libdir}/libMagickWand.so
%dir %{prefix}/include/ImageMagick %dir %{_includedir}/ImageMagick
%{prefix}/include/ImageMagick/magick %{_includedir}/ImageMagick/magick
%{prefix}/include/ImageMagick/wand %{_includedir}/ImageMagick/wand
%{prefix}/bin/MagickCore-config %{_bindir}/MagickCore-config
%{prefix}/bin/MagickWand-config %{_bindir}/MagickWand-config
%{prefix}/bin/Magick-config %{_bindir}/Magick-config
%{prefix}/bin/Wand-config %{_bindir}/Wand-config
%{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/ImageMagick.pc
%{_libdir}/pkgconfig/Wand.pc %{_libdir}/pkgconfig/Wand.pc
%{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/MagickCore.pc
@ -267,9 +268,9 @@ rm -rf $RPM_BUILD_ROOT
%doc Magick++/demo %doc Magick++/demo
%doc Magick++/NEWS Magick++/README Magick++/AUTHORS %doc Magick++/NEWS Magick++/README Magick++/AUTHORS
%{_libdir}/libMagick++.so %{_libdir}/libMagick++.so
%{prefix}/include/ImageMagick/Magick++.h %{_includedir}/ImageMagick/Magick++.h
%{prefix}/include/ImageMagick/Magick++ %{_includedir}/ImageMagick/Magick++
%{prefix}/bin/Magick++-config %{_bindir}/Magick++-config
%{_libdir}/pkgconfig/ImageMagick++.pc %{_libdir}/pkgconfig/ImageMagick++.pc
%{_libdir}/pkgconfig/Magick++.pc %{_libdir}/pkgconfig/Magick++.pc