[packages/ImageMagick/dev-7: 3/4] up to 7.0.1.1

glen glen at pld-linux.org
Mon May 23 22:14:36 CEST 2016 

commit b5feb670fd3983ea536eefde1ec4470a404c8e0f
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 | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)
---
diff --git a/ImageMagick.spec b/ImageMagick.spec
index d43816b..c92aa2e 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 (accurately represent the wide range of intensity levels found in real scenes)
+%bcond_without	hdri		# HDRI support (accurately represent the wide range of intensity levels found in real scenes)
 %bcond_with	gs		# PostScript support through ghostscript library (warning: breaks jpeg (and possibly tiff) because of symbol clashes!)
 # - modules:
 %bcond_without	djvu		# DJVU module
@@ -19,7 +19,7 @@
 # - module features:
 %bcond_without	autotrace	# Autotrace support in SVG module
 
-%define		ver	6.9.4
+%define		ver	7.0.1
 %define		pver	1
 %include	/usr/lib/rpm/macros.perl
 Summary:	Image display, conversion, and manipulation under X
@@ -38,7 +38,7 @@ Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz
-# Source0-md5:	430d33915b19f38012b55f98904c4f37
+# Source0-md5:	24673d00fcc8aa00313eeca6aa20fd3c
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-libpath.patch
 Patch3:		%{name}-ldflags.patch
@@ -98,8 +98,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
@@ -714,9 +714,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
@@ -870,8 +872,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
@@ -962,6 +964,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
@@ -970,11 +974,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*
@@ -987,9 +993,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
@@ -1123,28 +1129,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)
@@ -1170,7 +1176,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)
@@ -1178,8 +1184,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/25cd40cad1fa03b3fa728d210daf8e2ab09c7b79

More information about the pld-cvs-commit mailing list