pool/ImageMagick
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 201983 from graphics

Browse Source 
- documentation back to -doc package (bnc#841472)

- fix baselibs.conf for previous change (forwarded request 201922 from coolo)

OBS-URL: https://build.opensuse.org/request/show/201983
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=99
This commit is contained in:
Stephan Kulow 2013-10-03 05:25:29 +00:00 committed by Git OBS Bridge
commit 9efe00eab5
4 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ImageMagick.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Oct 2 12:33:43 UTC 2013 - dvaleev@suse.com
- disable mat tests for powerpc bnc#843673 (disable_mat_test.patch)
-------------------------------------------------------------------
Wed Oct 2 08:32:02 UTC 2013 - pgajdos@suse.com
- documentation back to -doc package (bnc#841472)
-------------------------------------------------------------------
Tue Oct 1 15:58:38 UTC 2013 - coolo@suse.com
- fix baselibs.conf for previous change
-------------------------------------------------------------------
Mon Sep 30 13:38:14 UTC 2013 - pgajdos@suse.com

48
ImageMagick.spec
View File

@ -75,6 +75,7 @@ Patch4: ImageMagick-6.8.5.7-no-XPMCompliance.patch
# bugs
# will ask upstream if needed, or if other solution exists
Patch11: ImageMagick-6.8.4.0-dont-build-in-install.patch
Patch12: disable_mat_test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package -n perl-PerlMagick
@ -139,6 +140,9 @@ BuildArch: noarch
%patch3 -p1
%patch4 -p1
%patch11 -p1
%ifarch ppc ppc64
%patch12 -p1
%endif
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -175,26 +179,22 @@ cd PerlMagick
make test
%install
%{__install} -d "${RPM_BUILD_ROOT%}"'%{_defaultdocdir}/%{name}/images'
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
pkgdocdir=%{_defaultdocdir}/%{name}/
DESTDIR=%{buildroot} \
pkgdocdir=%{_defaultdocdir}/%{name}-doc/
%perl_process_packlist
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 ..
%{__mv} -t "${RPM_BUILD_ROOT}"'%{_sysconfdir}'/%{name}* "${RPM_BUILD_ROOT}"'%{_datadir}'/%{name}*/*.xml
PATH='/bin:/usr/bin' find "${RPM_BUILD_ROOT}/%{_libdir}" -name "*.la" ! -empty \
%{__mv} -t %{buildroot}%{_sysconfdir}/%{name}* %{buildroot}%{_datadir}/%{name}*/*.xml
PATH='/bin:/usr/bin' find %{buildroot}/%{_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
%{__rm} %{buildroot}%{_libdir}/*.la
%if 0%{?suse_version} > 1020
%fdupes $RPM_BUILD_ROOT%{_includedir}/%{name}*/wand
%fdupes $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}*/www/api
%fdupes -s %{buildroot}%{_defaultdocdir}/%{name}-doc/www/api
%endif
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%post -n libMagickCore%{libspec}-%{clibver} -p /sbin/ldconfig
@ -210,9 +210,8 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%files
%defattr(-,root,root)
%docdir %{_docdir}/%{name}
%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
%{_bindir}/[^MW]*
%doc QuickStart.txt README.txt NEWS.txt ChangeLog LICENSE
%doc %{_mandir}/man1/*
%exclude %{_mandir}/man1/*-config.1.gz
@ -297,7 +296,7 @@ rm -rf %{buildroot}/%{_datadir}/doc/%{name}
%files doc
%defattr(-,root,root)
%dir %{_docdir}/%{name}
%{_docdir}/%{name}-doc
%description
ImageMagick is a robust collection of tools and libraries to read,
@ -397,27 +396,4 @@ HTML documentation for ImageMagick library and scene examples.
%changelog

12
baselibs.conf
View File

@ -1,11 +1,11 @@
libMagickCore-6_Q8-1
libMagickWand-6_Q8-1
libMagick++-6_Q8-2
libMagickCore-6_Q16-1
libMagickWand-6_Q16-1
libMagick++-6_Q16-2
ImageMagick-devel
requires -ImageMagick-<targettype>
requires "libMagickCore-6_Q8-1-<targettype> = <version>"
requires "libMagickWand-6_Q8-1-<targettype> = <version>"
requires "libMagickCore-6_Q16-1-<targettype> = <version>"
requires "libMagickWand-6_Q16-1-<targettype> = <version>"
libMagick++-devel
requires -ImageMagick-<targettype>
requires "libMagick++-6_Q8-2-<targettype> = <version>"
requires "libMagick++-6_Q16-2-<targettype> = <version>"

24
disable_mat_test.patch Normal file
View File

@ -0,0 +1,24 @@
Index: ImageMagick-6.8.6-9/PerlMagick/t/read.t
===================================================================
--- ImageMagick-6.8.6-9.orig/PerlMagick/t/read.t
+++ ImageMagick-6.8.6-9/PerlMagick/t/read.t
@@ -15,7 +15,7 @@
#
# Test reading formats supported directly by ImageMagick.
#
-BEGIN { $| = 1; $test=1; print "1..47\n"; }
+BEGIN { $| = 1; $test=1; print "1..46\n"; }
END {print "not ok $test\n" unless $loaded;}
use Image::Magick;
$loaded=1;
@@ -72,10 +72,6 @@ print("MAT (MatLab gray 8-bit MSB intege
++$test;
testReadCompare('input_gray_msb_08bit.mat', 'reference/read/input_gray_msb_08bit_mat.miff', q//, 0.2, 1.02);
-print("MAT (MatLab gray 64-bit LSB double) ...\n");
-++$test;
-testReadCompare('input_gray_lsb_double.mat', 'reference/read/input_gray_lsb_double_mat.miff', q//, 0.2, 1.02);
-
print("MAT (MatLab RGB 8-bit LSB integer) ...\n");
++$test;
testReadCompare('input_rgb_lsb_08bit.mat', 'reference/read/input_rgb_lsb_08bit_mat.miff', q//, 0.2, 1.02);