Accepting request 68143 from home:yecril71pl:branches:graphics

thanks

OBS-URL: https://build.opensuse.org/request/show/68143
OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=62
This commit is contained in:
Adrian Schröter 2011-04-26 13:18:27 +00:00 committed by Git OBS Bridge
parent c8fc7a327d
commit cc77f9f011
5 changed files with 1192 additions and 52 deletions

View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Apr 21 10:00:25 UTC 2011 - giecrilj@stegny.2a.pl
- 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)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 11 15:28:24 CEST 2011 - pgajdos@suse.cz Mon Apr 11 15:28:24 CEST 2011 - pgajdos@suse.cz

View File

@ -17,33 +17,92 @@
# norootforbuild # 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 Name: ImageMagick
BuildRequires: dcraw freetype2-devel gcc-c++ ghostscript-fonts-other ghostscript-fonts-std
BuildRequires: ghostscript-library liblcms-devel libtiff-devel libwmf-devel BuildRequires: pkgconfig fdupes
BuildRequires: libxml2-devel pkgconfig
BuildRequires: fdupes libdjvulibre-devel libexif-devel libjasper-devel %if %{with DCraw}
Obsoletes: imagemag BuildRequires: dcraw
Provides: imagemag %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 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 License: Public Domain, Freeware
Group: Productivity/Graphics/Other Group: Productivity/Graphics/Other
AutoReqProv: on AutoReqProv: on
Version: 6.6.8.9 Version: %{mfr_version}.%{mfr_revision}
Release: 1 Release: 1
%define source_version 6.6.8-9
%define libver 4 %define libver 4
Summary: Viewer and Converter for Images Summary: Viewer and Converter for Images
Url: http://www.imagemagick.org Url: http://www.imagemagick.org
Source: ImageMagick-%{source_version}.tar.bz2 Source: ImageMagick-6.6.9-5.tar.bz2
# To get mtime of file # To get mtime of file
Source1: ImageMagick.changes Source1: ImageMagick.changes
%if %{with xtp}
Source2: xtp-%{xtp_version}.tar.bz2 Source2: xtp-%{xtp_version}.tar.bz2
%endif
Source3: baselibs.conf Source3: baselibs.conf
Patch1: ImageMagick-%{version}-examples.patch Patch1: ImageMagick-6.6.8.9-examples.patch
Patch2: ImageMagick-%{version}-doc.patch Patch2: ImageMagick-6.6.8.9-doc.patch
Patch3: ImageMagick-6.6.9.1-inc-struct.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: imagemag = %{version}
Obsoletes: imagemag < %{version}
%package -n perl-PerlMagick %package -n perl-PerlMagick
License: Public Domain, Freeware License: Public Domain, Freeware
Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version} Requires: perl = %{perl_version} ImageMagick = %{version} libMagickCore%{libver} = %{version}
@ -88,39 +147,48 @@ AutoReqProv: on
License: PERMISSIVE-OSI-COMPLIANT License: PERMISSIVE-OSI-COMPLIANT
Requires: ImageMagick = %{version} Requires: ImageMagick
Summary: C++ Interface for ImageMagick - runtime library Summary: C++ Interface for ImageMagick - runtime library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
AutoReqProv: on AutoReqProv: on
# was last used in openSUSE 10.2 # was last used in openSUSE 10.2
Provides: ImageMagick-Magick++ = 6.3.3 Provides: ImageMagick-Magick++ = %{version}
Obsoletes: ImageMagick-Magick++ <= 6.3.3 Obsoletes: ImageMagick-Magick++ < %{version}
%package -n libMagick++-devel %package -n libMagick++-devel
License: PERMISSIVE-OSI-COMPLIANT License: PERMISSIVE-OSI-COMPLIANT
Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel Requires: ImageMagick-devel = %{version} libMagick++%{libver} = %{version} libstdc++-devel
Summary: C++ Interface for ImageMagick - files mandatory for development Summary: C++ Interface for ImageMagick - files mandatory for development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: ImageMagick-Magick++-devel Provides: ImageMagick-Magick++-devel = %{version}
Obsoletes: ImageMagick-Magick++-devel <= %{version} Obsoletes: ImageMagick-Magick++-devel < %{version}
AutoReqProv: on AutoReqProv: on
%package doc %package doc
License: PERMISSIVE-OSI-COMPLIANT 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}
%if 0%{?suse_version} >= 1120 %if 0%{?suse_version} >= 1120
BuildArch: noarch BuildArch: noarch
%endif %endif
%prep %prep
rm -rf xtp-%{xtp_version} rm -rf xtp-%{xtp_version}
%if %{with xtp}
%setup -n ImageMagick-%{source_version} -b 2 %setup -n ImageMagick-%{source_version} -b 2
%else
%setup -n ImageMagick-%{source_version}
%endif
%patch1 %patch1
%patch2 %patch2
%patch3 -p1
echo>header-test.c '#include "wand.h"'
echo>wand.h '#include "wand/MagickWand.h"'
%{__make} header-test.o
%build %build
%define CFLAGS ${RPM_OPT_FLAGS} -fstack-protector-all
%define LDFLAGS -L%{_libdir} -fuse-linker-plugin
%define system_ltdl 0 %define system_ltdl 0
%if %system_ltdl %if %system_ltdl
cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl cp -f %{_datadir}/libtool/libltdl/*.{c,h} ltdl
@ -132,37 +200,36 @@ CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10`
sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh sed -i -e "s|^PACKAGE_RELEASE_DATE.*$|PACKAGE_RELEASE_DATE=\"$CHANGES\"|" version.sh
autoreconf --force --install -v autoreconf --force --install -v
%if %{with xtp}
pushd ../xtp-%{xtp_version} pushd ../xtp-%{xtp_version}
autoreconf --force --install autoreconf --force --install
popd popd
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all" %endif
export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector-all"
%if %suse_version <= 1030 %if %{suse_version} <= 1030
# openmp does not work with perl module # openmp does not work with perl module
OPENMP="--disable-openmp" OPENMP="--disable-openmp"
%endif %endif
export LDFLAGS="-L%{_libdir}"
%configure \ %configure \
--enable-shared \ --enable-shared \
--without-frozenpaths \ --without-frozenpaths \
--with-largefiles \
--with-magick_plus_plus \ --with-magick_plus_plus \
--with-modules \ --with-modules \
--with-threads \ --with-threads \
--without-perl \ --without-perl \
--disable-static \ --disable-static \
--enable-libtool-verbose \ --with-djvu=yes $OPENMP CFLAGS="%{CFLAGS}" CXXFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
--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="%{_libdir}:%{_prefix}/X11R6/%{_lib}" make %{?jobs:-j%jobs} LD_RUN_PATH="%{_libdir}:%{_prefix}/X11R6/%{_lib}"
# #
%if %{with xtp}
cd ../../xtp-%{xtp_version} cd ../../xtp-%{xtp_version}
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %configure "CFLAGS=${RPM_OPT_FLAGS} -D_GNU_SOURCE" "CXXFLAGS=${RPM_OPT_FLAGS}"
export CXXFLAGS="$RPM_OPT_FLAGS"
%configure
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
%endif
%check %check
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs
@ -173,35 +240,39 @@ 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 QuickStart.txt README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
cd PerlMagick 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 %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}
mv demo/makefile.2 demo/Makefile PATH='/bin:/usr/bin' find demo -type f -perm +111 -execdir %{__rm} -rf '{}' ';'
%{__mv} demo/makefile.2 demo/Makefile
cd .. cd ..
%if %{with xtp}
pushd ../xtp-%{xtp_version} pushd ../xtp-%{xtp_version}
make DESTDIR=$RPM_BUILD_ROOT install %{__make} DESTDIR=$RPM_BUILD_ROOT install
install -m 644 README.txt $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/README-xtp.txt
popd popd
mv $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/ImageMagick* %endif
mv -f $RPM_BUILD_ROOT%{_datadir}/ImageMagick*/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/
cp -a scenes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ %{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml
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" %{__cp} -a -t "${RPM_BUILD_ROOT}"'%{_defaultdocdir}/%{name}/' scenes
rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -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 %if 0%{?suse_version} > 1020
%fdupes $RPM_BUILD_ROOT%{_includedir}/ImageMagick/wand %fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}/wand
%fdupes $RPM_BUILD_ROOT%{_datadir}/doc/packages/ImageMagick/www/api %fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/www/api
%endif %endif
%clean %clean
rm -rf $RPM_BUILD_ROOT %{__rm} -rf $RPM_BUILD_ROOT
%post -n libMagickCore%{libver} -p /sbin/ldconfig %post -n libMagickCore%{libver} -p /sbin/ldconfig
@ -218,14 +289,18 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%docdir %{_docdir}/%{name} %docdir %{_docdir}/%{name}
%{_docdir}/%{name}/*.txt %doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
%{_docdir}/%{name}/ChangeLog %define mfr_docdir %{_defaultdocdir}/../%{name}-%{mfr_version}/packages/%{name}/
%{_docdir}/%{name}/LICENSE %exclude %{mfr_docdir}ChangeLog
%exclude %{mfr_docdir}LICENSE
%exclude %{mfr_docdir}NEWS.txt
%{_bindir}/[^MW]* %{_bindir}/[^MW]*
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1.gz
%files -n libMagickCore%{libver} %files -n libMagickCore%{libver}
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%dir %{_sysconfdir}/ImageMagick* %dir %{_sysconfdir}/ImageMagick*
%config %{_sysconfdir}/ImageMagick*/* %config %{_sysconfdir}/ImageMagick*/*
%{_libdir}/libMagickCore.so.%{libver}* %{_libdir}/libMagickCore.so.%{libver}*
@ -241,10 +316,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n libMagickWand%{libver} %files -n libMagickWand%{libver}
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%{_libdir}/libMagickWand.so.%{libver}* %{_libdir}/libMagickWand.so.%{libver}*
%files extra %files extra
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%{_libdir}/ImageMagick*/modules*/*/wmf.so %{_libdir}/ImageMagick*/modules*/*/wmf.so
# don't remove la files, see bnc#579798 # don't remove la files, see bnc#579798
%{_libdir}/ImageMagick*/modules*/*/wmf.la %{_libdir}/ImageMagick*/modules*/*/wmf.la
@ -255,11 +332,13 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%{_libdir}/libMagickCore.so %{_libdir}/libMagickCore.so
%{_libdir}/libMagickWand.so %{_libdir}/libMagickWand.so
%dir %{_includedir}/ImageMagick %dir %{_includedir}/ImageMagick
%{_includedir}/ImageMagick/magick %{_includedir}/ImageMagick/magick
%{_includedir}/ImageMagick/wand %{_includedir}/ImageMagick/wand
%{_includedir}/ImageMagick/wand.h
%{_bindir}/MagickCore-config %{_bindir}/MagickCore-config
%{_bindir}/MagickWand-config %{_bindir}/MagickWand-config
%{_bindir}/Magick-config %{_bindir}/Magick-config
@ -268,9 +347,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/Wand.pc %{_libdir}/pkgconfig/Wand.pc
%{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/MagickCore.pc
%{_libdir}/pkgconfig/MagickWand.pc %{_libdir}/pkgconfig/MagickWand.pc
%doc %{_mandir}/man1/*-config.1.gz
%exclude %{_mandir}/man1/Magick++-config.1.gz
%files -n perl-PerlMagick %files -n perl-PerlMagick
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%doc PerlMagick/README.txt %doc PerlMagick/README.txt
%doc PerlMagick/demo %doc PerlMagick/demo
%if %suse_version < 1140 %if %suse_version < 1140
@ -282,10 +364,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n libMagick++%{libver} %files -n libMagick++%{libver}
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%{_libdir}/libMagick++.so.%{libver}* %{_libdir}/libMagick++.so.%{libver}*
%files -n libMagick++-devel %files -n libMagick++-devel
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE
%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
@ -294,14 +378,17 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/Magick++-config %{_bindir}/Magick++-config
%{_libdir}/pkgconfig/ImageMagick++.pc %{_libdir}/pkgconfig/ImageMagick++.pc
%{_libdir}/pkgconfig/Magick++.pc %{_libdir}/pkgconfig/Magick++.pc
%doc %{_mandir}/man1/Magick++-config.1.gz
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_docdir}/%{name} %dir %{_docdir}/%{name}
%if 0
%{_docdir}/%{name}/index.html %{_docdir}/%{name}/index.html
%{_docdir}/%{name}/www %{_docdir}/%{name}/www
%{_docdir}/%{name}/images %{_docdir}/%{name}/images
%{_docdir}/%{name}/scenes %{_docdir}/%{name}/scenes
%endif
%description %description
ImageMagick is a robust collection of tools and libraries to read, ImageMagick is a robust collection of tools and libraries to read,