Hello community, here is the log from the commit of package GraphicsMagick for openSUSE:Factory checked in at 2017-10-17 01:51:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/GraphicsMagick (Old) and /work/SRC/openSUSE:Factory/.GraphicsMagick.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "GraphicsMagick" Tue Oct 17 01:51:40 2017 rev:61 rq:533625 version:1.3.26 Changes: -------- --- /work/SRC/openSUSE:Factory/GraphicsMagick/GraphicsMagick.changes 2017-09-12 19:55:05.745600873 +0200 +++ /work/SRC/openSUSE:Factory/.GraphicsMagick.new/GraphicsMagick.changes 2017-10-17 01:51:41.256768465 +0200 @@ -1,0 +2,5 @@ +Tue Sep 19 13:21:49 UTC 2017 - [email protected] + +- builds for sle11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ GraphicsMagick.spec ++++++ --- /var/tmp/diff_new_pack.16s7Nr/_old 2017-10-17 01:51:42.136727243 +0200 +++ /var/tmp/diff_new_pack.16s7Nr/_new 2017-10-17 01:51:42.136727243 +0200 @@ -16,7 +16,11 @@ # -# Define Quantum depth +%if 0%{?suse_version} >= 1315 +%define bindperl 1 +%else +%define bindperl 0 +%endif %define quant 16 %define base_version 1.3 %define so_ver 3 @@ -32,8 +36,12 @@ Source: ftp://ftp.GraphicsMagick.org/pub/%{name}/%{base_version}/%{name}-%{version}.tar.bz2 # following typemap file is needed for building PerlMagick with perl 5.16; # should be present in Graphics Magick 1.4.0 +%if %{bindperl} Source1: typemap +%endif +%if %{bindperl} Patch0: GraphicsMagick-perl-linkage.patch +%endif BuildRequires: cups-client BuildRequires: dcraw BuildRequires: gcc-c++ @@ -41,9 +49,12 @@ BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-library BuildRequires: libjasper-devel +%if 0%{?suse_version} >= 1315 BuildRequires: libjbig-devel BuildRequires: libltdl-devel +%endif BuildRequires: libwmf-devel +%if 0%{?suse_version} >= 1315 BuildRequires: pkgconfig BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) @@ -51,6 +62,13 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libxml-2.0) +%else +BuildRequires: freetype2-devel +BuildRequires: libbz2-devel +BuildRequires: libtiff-devel +BuildRequires: libxml-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%endif Requires: xorg-x11-fonts %description @@ -132,6 +150,7 @@ may be used to create animated or transparent .gifs, to composite images, and to create thumbnail images. +%if %{bindperl} %package -n perl-GraphicsMagick Summary: Perl interface for the GraphicsMagick image conversion library Group: Development/Languages/Perl @@ -148,6 +167,7 @@ images, and to create thumbnail images. This package contains perl interface to GraphicsMagick library. +%endif %package -n libGraphicsMagick++-Q%{quant}-%{pp_so_ver} Summary: C++ interface for the GraphisMagick image conversion library @@ -184,7 +204,9 @@ %prep %setup -q +%if %{bindperl} %patch0 -p1 +%endif %build # This shouldn't be there yet. @@ -202,6 +224,7 @@ --x-libraries=%{_libdir} \ --x-includes=%{_prefix}/include make %{?_smp_mflags} LDFLAGS="-pie" +%if %{bindperl} cd PerlMagick if [ -e PerlMagick/typemap ]; then echo "With Graphics Magick 1.4.0, typmap exists yet, please " @@ -212,10 +235,21 @@ fi perl Makefile.PL make %{?_smp_mflags} LD_RUN_PATH="%{_libdir}" +%endif %install +%if 0%{?suse_version} >= 1315 %make_install +%else +make install \ + DESTDIR=%{buildroot} \ + pkgdocdir=%{_defaultdocdir}/%{name}-%{maj}/ +%endif +rm -f %{buildroot}%{_libdir}/libGraphicsMagick.la +rm -f %{buildroot}%{_libdir}/libGraphicsMagick++.la +rm -f %{buildroot}%{_libdir}/libGraphicsMagickWand.la cp ChangeLog* *.txt %{buildroot}/%{_defaultdocdir}/%{name} +%if %{bindperl} cd PerlMagick make DESTDIR=%{buildroot} LD_RUN_PATH="%{_libdir}" install_vendor %perl_process_packlist @@ -226,17 +260,17 @@ rm -f `find %{buildroot}%{_libexecdir}/perl*/ -name perllocal.pod -type f` rm -f `find %{buildroot}%{_libexecdir}/perl*/ -name .packlist -type f` rm -f %{buildroot}%{_localstatedir}/adm/perl-modules/GraphicsMagick -rm -f %{buildroot}%{_libdir}/libGraphicsMagick.la -rm -f %{buildroot}%{_libdir}/libGraphicsMagick++.la -rm -f %{buildroot}%{_libdir}/libGraphicsMagickWand.la +%endif %check make %{?_smp_mflags} check export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/magick/.libs:$PWD/wand/.libs export MAGICK_CODER_MODULE_PATH=$PWD/coders/.libs export MAGICK_CONFIGURE_PATH=$PWD/config +%if %{bindperl} cd PerlMagick make test +%endif %post -n libGraphicsMagick-Q%{quant}-%{so_ver} -p /sbin/ldconfig %postun -n libGraphicsMagick-Q%{quant}-%{so_ver} -p /sbin/ldconfig @@ -246,6 +280,9 @@ %postun -n libGraphicsMagick++-Q%{quant}-%{pp_so_ver} -p /sbin/ldconfig %files +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %docdir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name} %doc %{_datadir}/%{name}-%{version} @@ -256,6 +293,9 @@ %{_mandir}/man5/*%{ext_man} %files -n libGraphicsMagick-Q%{quant}-%{so_ver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/lib%{name}-Q%{quant}.so.* %dir %{_libdir}/%{name}-%{version} %dir %{_libdir}/%{name}-%{version}/modules-Q%{quant} @@ -265,15 +305,24 @@ %{_libdir}/%{name}-%{version}/modules-Q%{quant}/*/*.la %files -n libGraphicsMagick%{so_ver}-config +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %dir %{_libdir}/%{name}-%{version}/config %{_libdir}/%{name}-%{version}/config/*.mgk %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/config %files -n libGraphicsMagickWand-Q%{quant}-%{wand_so_ver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/lib%{name}Wand-Q%{quant}.so.* %files devel +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %dir %{_includedir}/%{name} %dir %{_includedir}/%{name}/wand %{_includedir}/%{name}/wand/* @@ -289,6 +338,7 @@ %{_mandir}/man1/%{name}-config.1%{ext_man} %{_mandir}/man1/%{name}Wand-config.1%{ext_man} +%if %{bindperl} %files -n perl-GraphicsMagick %dir %{perl_vendorarch}/Graphics %dir %{perl_vendorarch}/auto/Graphics @@ -296,11 +346,18 @@ %{perl_vendorarch}/Graphics/Magick.pm %{perl_vendorarch}/auto/Graphics/Magick/* %{_mandir}/man3/*%{ext_man} +%endif %files -n libGraphicsMagick++-Q%{quant}-%{pp_so_ver} +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %{_libdir}/lib%{name}++-Q%{quant}.so.* %files -n libGraphicsMagick++-devel +%if 0%{?suse_version} < 1315 +%defattr(-,root,root) +%endif %dir %{_includedir}/%{name} %dir %{_includedir}/%{name}/Magick++ %{_includedir}/%{name}/Magick++.h
