[packages/ImageMagick/dev-7] up to 7.0.1.1
glen
glen at pld-linux.org
Mon May 23 19:51:22 CEST 2016
commit c1387fbd685a693a18d7128cd956ae705c32fb73
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 7 16:17:43 2016 +0300
up to 7.0.1.1
ImageMagick.spec | 52 +++++++++++++++++++++++++++++-----------------------
1 file changed, 29 insertions(+), 23 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 7fffdc7..20d4507 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -7,7 +7,7 @@
%bcond_without cxx # Magick++ library
%bcond_without opencl # OpenCL computing support
%bcond_without openmp # OpenMP computing support
-%bcond_with hdri # HDRI support
+%bcond_without hdri # HDRI support
%bcond_with gs # PostScript support through ghostscript library
# (warning: breaks jpeg (and possibly tiff) because of symbol clashes!)
# - modules:
@@ -20,8 +20,8 @@
# - module features:
%bcond_without autotrace # Autotrace support in SVG module
-%define ver 6.9.3
-%define pver 10
+%define ver 7.0.1
+%define pver 1
%include /usr/lib/rpm/macros.perl
Summary: Image display, conversion, and manipulation under X
Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X
@@ -39,7 +39,7 @@ Epoch: 1
License: Apache-like
Group: X11/Applications/Graphics
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5: 04f7793916dfe99c4ee0b4e453392119
+# Source0-md5: 24673d00fcc8aa00313eeca6aa20fd3c
Patch1: %{name}-link.patch
Patch2: %{name}-libpath.patch
Patch3: %{name}-ldflags.patch
@@ -99,8 +99,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%endif
%define abisuf Q%{QuantumDepth}%{?with_hdri:HDRI}
%define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf}
-%define mver 6
-%define pname ImageMagick-6
+%define mver 7
+%define pname ImageMagick-7
%description
ImageMagick is an image display, conversion, and manipulation tool. It
@@ -715,9 +715,11 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
pkgdocdir=%{_docdir}/%{name}-doc-%{version}
# for coders development
+%if 0
install -d $RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick
cp -p magick/{blob,blob-private,delegate-private,exception-private,image-private,monitor-private,nt-base-private,quantum-private,static,studio}.h \
$RPM_BUILD_ROOT%{_includedir}/%{pname}/private/magick
+%endif
cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
@@ -871,8 +873,8 @@ rm -rf $RPM_BUILD_ROOT
%{modulesdir}/coders/plasma.la
%attr(755,root,root) %{modulesdir}/coders/pnm.so
%{modulesdir}/coders/pnm.la
-%attr(755,root,root) %{modulesdir}/coders/preview.so
-%{modulesdir}/coders/preview.la
+#%attr(755,root,root) %{modulesdir}/coders/preview.so
+#%{modulesdir}/coders/preview.la
%attr(755,root,root) %{modulesdir}/coders/psd.so
%{modulesdir}/coders/psd.la
%attr(755,root,root) %{modulesdir}/coders/ps.so
@@ -963,6 +965,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/display
%attr(755,root,root) %{_bindir}/identify
%attr(755,root,root) %{_bindir}/import
+%attr(755,root,root) %{_bindir}/magick
+%attr(755,root,root) %{_bindir}/magick-script
%attr(755,root,root) %{_bindir}/mogrify
%attr(755,root,root) %{_bindir}/montage
%attr(755,root,root) %{_bindir}/stream
@@ -971,11 +975,13 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/animate.1*
%{_mandir}/man1/compare.1*
%{_mandir}/man1/composite.1*
-%{_mandir}/man1/convert.1*
%{_mandir}/man1/conjure.1*
+%{_mandir}/man1/convert.1*
%{_mandir}/man1/display.1*
%{_mandir}/man1/identify.1*
%{_mandir}/man1/import.1*
+%{_mandir}/man1/magick-script.1*
+%{_mandir}/man1/magick.1*
%{_mandir}/man1/mogrify.1*
%{_mandir}/man1/montage.1*
%{_mandir}/man1/stream.1*
@@ -988,9 +994,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog LICENSE AUTHORS.txt
%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.2
+%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.0
%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.2
+%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.0
%dir %{_libdir}/ImageMagick-%{ver}
%dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}
%{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml
@@ -1124,28 +1130,28 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/Magick-config
+#%attr(755,root,root) %{_bindir}/Magick-config
%attr(755,root,root) %{_bindir}/MagickCore-config
%attr(755,root,root) %{_bindir}/MagickWand-config
-%attr(755,root,root) %{_bindir}/Wand-config
+#%attr(755,root,root) %{_bindir}/Wand-config
%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so
%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so
%dir %{_includedir}/%{pname}
-%{_includedir}/%{pname}/magick
-%{_includedir}/%{pname}/wand
-%{_includedir}/%{pname}/private
+%{_includedir}/%{pname}/MagickCore
+%{_includedir}/%{pname}/MagickWand
+#%{_includedir}/%{pname}/private
%{_pkgconfigdir}/%{pname}.%{abisuf}.pc
%{_pkgconfigdir}/ImageMagick.pc
%{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/MagickCore.pc
%{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/MagickWand.pc
-%{_pkgconfigdir}/Wand-%{mver}.%{abisuf}.pc
-%{_pkgconfigdir}/Wand.pc
-%{_mandir}/man1/Magick-config.1*
+#%{_pkgconfigdir}/Wand-%{mver}.%{abisuf}.pc
+#%{_pkgconfigdir}/Wand.pc
+#%{_mandir}/man1/Magick-config.1*
%{_mandir}/man1/MagickCore-config.1*
%{_mandir}/man1/MagickWand-config.1*
-%{_mandir}/man1/Wand-config.1*
+#%{_mandir}/man1/Wand-config.1*
%files static
%defattr(644,root,root,755)
@@ -1171,7 +1177,7 @@ rm -rf $RPM_BUILD_ROOT
%files c++
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.6
+%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.0
%files c++-devel
%defattr(644,root,root,755)
@@ -1179,8 +1185,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so
%{_includedir}/%{pname}/Magick++
%{_includedir}/%{pname}/Magick++.h
-%{_pkgconfigdir}/ImageMagick++-%{mver}.%{abisuf}.pc
-%{_pkgconfigdir}/ImageMagick++.pc
+#%{_pkgconfigdir}/ImageMagick++-%{mver}.%{abisuf}.pc
+#%{_pkgconfigdir}/ImageMagick++.pc
%{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc
%{_pkgconfigdir}/Magick++.pc
%{_mandir}/man1/Magick++-config.1*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ImageMagick.git/commitdiff/c1387fbd685a693a18d7128cd956ae705c32fb73
More information about the pld-cvs-commit
mailing list