- reverted pname overuse

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index eae952765f12a953985bbdf1b89b9370b31ba6db..a80cc14220dbab28a6460fd1877241597a0dc1b6 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -7,9 +7,8 @@
 %bcond_without cxx             # Magick++ library
 %bcond_without opencl          # OpenCL computing support
 %bcond_without openmp          # OpenMP computing support
-%bcond_with    hdri            # HDRI support
-%bcond_with    gs              # PostScript support through ghostscript library
-#                                (warning: breaks jpeg (and possibly tiff) because of symbol clashes!)
+%bcond_with    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
 %bcond_without exr             # OpenEXR module
@@ -20,8 +19,8 @@
 # - module features:
 %bcond_without autotrace       # Autotrace support in SVG module
 
-%define                ver     6.9.4
-%define                pver    1
+%define                ver     6.9.5
+%define                pver    2
 %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 +38,8 @@ 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: 60727655acec7c3e766f9ba2c744419b
+Patch0:                config.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-libpath.patch
 Patch3:                %{name}-ldflags.patch
@@ -658,6 +658,7 @@ Moduł kodera dla plików WMF.
 
 %prep
 %setup -q -n %{name}-%{ver}-%{pver}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -1134,7 +1135,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{pname}/magick
 %{_includedir}/%{pname}/wand
 %{_includedir}/%{pname}/private
-%{_pkgconfigdir}/%{pname}.%{abisuf}.pc
+%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc
 %{_pkgconfigdir}/ImageMagick.pc
 %{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc
 %{_pkgconfigdir}/MagickCore.pc