X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ImageMagick.spec;h=a2cd8632be8c4c6a021ea38d9ee0e94ea324113d;hb=d81f8ca;hp=6dc2dcb6bb37b952ad611f147aa3bb7f14f41088;hpb=abe0b11bce8cbf4235d5f8ab738a29e3e3e3fea7;p=packages%2FImageMagick.git diff --git a/ImageMagick.spec b/ImageMagick.spec index 6dc2dcb..a2cd863 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,26 +1,30 @@ +# TODO +# - flif (flif.h, flif_create_decoder in libflif) +# - raqm (raqm.pc) +# - create sane default policy file: +# https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=26801 # # Conditional build: # - features: %bcond_without cxx # Magick++ library -%bcond_without gomp # OpenMP computing support %bcond_without opencl # OpenCL 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_without openmp # OpenMP computing support +%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 %bcond_without fpx # FlashPIX module (which uses fpx library) %bcond_without graphviz # dot module (which uses GraphViz libraries) -%bcond_without jasper # JPEG2000 module (which uses jasper library) +%bcond_without openjpeg # JPEG2000 module (which uses openjpeg 2 library) %bcond_without wmf # WMF module (which uses libwmf library) -# - module feautres: +# - module features: %bcond_without autotrace # Autotrace support in SVG module -%bcond_with mupdf # MuPDF support in XPS module (not really used) +%define origname ImageMagick +%define ver 6.9.7 +%define pver 0 %include /usr/lib/rpm/macros.perl -%define ver 6.8.7 -%define pver 6 Summary: Image display, conversion, and manipulation under X Summary(de.UTF-8): Darstellen, Konvertieren und Bearbeiten von Grafiken unter X Summary(es.UTF-8): Exhibidor, convertidor y manipulador de imágenes bajo X @@ -30,20 +34,21 @@ Summary(pt_BR.UTF-8): Exibidor, conversor e manipulador de imagens sob X Summary(ru.UTF-8): Просмотр, конвертирование, обработка изображений под X Window Summary(tr.UTF-8): X altında resim gösterme, çevirme ve değişiklik yapma Summary(uk.UTF-8): Перегляд, конвертування та обробка зображень під X Window -Name: ImageMagick +Name: ImageMagick6 Version: %{ver}%{?pver:.%{pver}} -Release: 3 +Release: 4 Epoch: 1 License: Apache-like Group: X11/Applications/Graphics -Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{name}-%{ver}-%{pver}.tar.xz -# Source0-md5: 9370a8f672fd1fab779ea9acbd6b0ad4 -Patch0: %{name}-ac.patch -Patch1: %{name}-link.patch -Patch2: %{name}-libpath.patch -Patch3: %{name}-ldflags.patch -Patch4: %{name}-lt.patch -Patch5: %{name}-mupdf.patch +Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/%{origname}-%{ver}-%{pver}.tar.xz +# Source0-md5: 98358e387587e102e7ecc5d3c465865a +Patch0: config.patch +Patch1: %{origname}-link.patch +Patch2: %{origname}-libpath.patch +Patch3: %{origname}-ldflags.patch +Patch4: %{origname}-lt.patch +Patch5: perlmagick.patch +Patch6: magick6.patch URL: http://www.imagemagick.org/ %{?with_opencl:BuildRequires: OpenCL-devel} BuildRequires: OpenEXR-devel >= 1.0.6 @@ -51,19 +56,18 @@ BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.12 %{?with_autotrace:BuildRequires: autotrace-devel >= 0.31.1} BuildRequires: bzip2-devel >= 1.0.1 -%{?with_djvu:BuildRequires: djvulibre-devel} +%{?with_djvu:BuildRequires: djvulibre-devel >= 3.5.0} BuildRequires: expat-devel >= 1.95.7 BuildRequires: fftw3-devel >= 3.0 BuildRequires: fontconfig-devel >= 2.1.0 BuildRequires: freetype-devel >= 2.0.2-2 -%{?with_gomp:BuildRequires: gcc-c++ >= 6:4.2} +%{?with_openmp:BuildRequires: gcc-c++ >= 6:4.2} %{?with_gs:BuildRequires: ghostscript-devel} %{?with_graphviz:BuildRequires: graphviz-devel >= 2.9.0} -%{?with_jasper:BuildRequires: jasper-devel >= 1.700.5} BuildRequires: jbigkit-devel BuildRequires: lcms2-devel >= 2.0 %{?with_fpx:BuildRequires: libfpx-devel >= 1.2.0.4-3} -%{?with_gomp:BuildRequires: libgomp-devel} +%{?with_openmp:BuildRequires: libgomp-devel} BuildRequires: libjpeg-devel >= 6b BuildRequires: liblqr-devel >= 0.1.0 BuildRequires: libltdl-devel @@ -75,28 +79,34 @@ BuildRequires: libtool >= 2:2.2 BuildRequires: libwebp-devel %{?with_wmf:BuildRequires: libwmf-devel >= 2:0.2.2} BuildRequires: libxml2-devel >= 2.0 -%{?with_mupdf:BuildRequires: mupdf-devel} +%{?with_openjpeg:BuildRequires: openjpeg2-devel >= 2.1.0} BuildRequires: pango-devel >= 1:1.28.1 BuildRequires: perl-devel >= 1:5.8.1 -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 1:0.20 BuildRequires: rpm-perlprov >= 4.1-13 BuildRequires: rpmbuild(macros) >= 1.315 BuildRequires: tar >= 1:1.22 # only checked for, but only supplied scripts/txt2html is used +BuildRequires: tar >= 1:1.22 #BuildRequires: txt2html +BuildRequires: xorg-lib-libX11 BuildRequires: xorg-lib-libXext BuildRequires: xz BuildRequires: xz-devel >= 2.9.0 -BuildRequires: zlib-devel +BuildRequires: zlib-devel >= 1.0.0 Requires: %{name}-libs = %{epoch}:%{version}-%{release} Suggests: shared-color-profiles Obsoletes: ImageMagick-coder-dps Obsoletes: ImageMagick-coder-mpeg BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%{!?QuantumDepth: %define QuantumDepth 16} +%if 0%{!?QuantumDepth:1} +%define QuantumDepth 16 +%endif %define abisuf Q%{QuantumDepth}%{?with_hdri:HDRI} %define modulesdir %{_libdir}/ImageMagick-%{ver}/modules-%{abisuf} +%define mver 6 +%define pname ImageMagick-6 %description ImageMagick is an image display, conversion, and manipulation tool. It @@ -169,6 +179,7 @@ Summary(pt_BR.UTF-8): Bibliotecas dinâmicas do ImageMagick Group: X11/Libraries Requires: fontconfig-libs >= 2.1.0 Requires: liblqr >= 0.1.0 +Requires: zlib >= 1.0.0 %description libs ImageMagick libraries. @@ -194,13 +205,13 @@ Requires: fftw3-devel >= 3.0 Requires: fontconfig-devel >= 2.1.0 Requires: freetype-devel >= 2.0.2 Requires: lcms2-devel >= 2.0 -%{?with_gomp:Requires: libgomp-devel} +%{?with_openmp:Requires: libgomp-devel} Requires: libjpeg-devel >= 6b Requires: liblqr-devel >= 0.1.0 Requires: libltdl-devel Requires: libtiff-devel Requires: xorg-lib-libXext-devel -Requires: zlib-devel +Requires: zlib-devel >= 1.0.0 %description devel This is the ImageMagick development package. It includes header files @@ -433,6 +444,7 @@ Summary: Coder module for DJVU files Summary(pl.UTF-8): Moduł kodera dla plików DJVU Group: X11/Applications/Graphics Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: djvulibre >= 3.5.0 %description coder-djvu Coder module for DJVU files. @@ -547,6 +559,7 @@ Summary(pl.UTF-8): Moduł kodera do odczytu formatu języka znaczników pango Group: X11/Applications/Graphics URL: http://www.imagemagick.org/Usage/text/#pango Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: pango >= 1:1.28.1 %description coder-pango Coder module to read pango markup language format. @@ -653,13 +666,14 @@ Coder module for WMF files. Moduł kodera dla plików WMF. %prep -%setup -q -n %{name}-%{ver}-%{pver} +%setup -q -n %{origname}-%{ver}-%{pver} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 find -type f | xargs grep -l '/usr/local/bin/perl' | xargs %{__sed} -i -e 's=!/usr/local/bin/perl=!%{__perl}=' @@ -673,11 +687,12 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html %{__autoheader} %{__automake} %configure \ + --with-gcc-arch=no \ %{!?with_opencl:--disable-opencl} \ - %{!?with_gomp:--disable-openmp} \ + %{!?with_openmp:--disable-openmp} \ --disable-silent-rules \ --enable-fast-install \ - %{?with_hdri:--enable-hdri} \ + %{__enable_disable hdri} \ --enable-shared \ --enable-static \ --with-modules \ @@ -687,10 +702,9 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html --with-fpx%{!?with_fpx:=no} \ --with-gslib%{!?with_gs:=no} \ --with-gvc%{!?with_graphviz:=no} \ - --with-jp2%{!?with_jasper:=no} \ --with-magick_plus_plus%{!?with_cxx:=no} \ - --with-mupdf%{!?with_mupdf:=no} \ --with-openexr%{!?with_exr:=no} \ + --with-openjp2%{!?with_openjpeg:=no} \ --with-wmf%{!?with_wmf:=no} \ --with-gs-font-dir=%{_fontsdir}/Type1 \ --with-perl=%{__perl} \ @@ -702,7 +716,7 @@ touch www/Magick++/NEWS.html www/Magick++/ChangeLog.html --with-x %{__make} -j1 -%{__sed} -i -e 's,/%{name}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1 +%{__sed} -i -e 's,/%{origname}-%{ver}/,/%{name}-doc-%{version}/,' utilities/*.1 %install rm -rf $RPM_BUILD_ROOT @@ -712,15 +726,29 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version} DESTDIR=$RPM_BUILD_ROOT \ pkgdocdir=%{_docdir}/%{name}-doc-%{version} +for f in Magick Wand MagickCore MagickWand Magick++; do + %{__mv} $RPM_BUILD_ROOT%{_bindir}/$f{,6}-config + %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$f{,6}-config.1 +done +for f in ImageMagick MagickCore MagickWand Wand ImageMagick++ Magick++; do + %{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/$f{,6}.pc +done +for f in animate compare composite conjure convert display identify import mogrify montage stream ; do + %{__mv} $RPM_BUILD_ROOT%{_bindir}/$f{,6} + %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/$f{,6}.1 +done +%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/ImageMagick{,6}.1 + # for coders development -install -d $RPM_BUILD_ROOT%{_includedir}/ImageMagick-6/private/magick -cp -p magick/{blob,blob-private,exception-private,image-private,monitor-private,quantum-private,static,studio}.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick-6/private/magick +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 cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version} %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod # packaged as %doc -%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-6/{ChangeLog,LICENSE,NEWS.txt} +%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{origname}-%{mver}/{ChangeLog,LICENSE,NEWS.txt} # obsoleted by pkg-config %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la @@ -738,10 +766,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{modulesdir} %dir %{modulesdir}/coders %dir %{modulesdir}/filters -%dir %{_datadir}/ImageMagick-6 -%{_datadir}/ImageMagick-6/*.xml -%dir %{_sysconfdir}/ImageMagick-6 -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ImageMagick-6/*.xml +%dir %{_datadir}/%{pname} +%{_datadir}/%{pname}/*.xml +%dir %{_sysconfdir}/%{pname} +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{pname}/*.xml # ========= coders without additional deps %attr(755,root,root) %{modulesdir}/coders/aai.so @@ -810,6 +838,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/info.la %attr(755,root,root) %{modulesdir}/coders/inline.so %{modulesdir}/coders/inline.la +%attr(755,root,root) %{modulesdir}/coders/json.so +%{modulesdir}/coders/json.la %attr(755,root,root) %{modulesdir}/coders/ipl.so %{modulesdir}/coders/ipl.la %attr(755,root,root) %{modulesdir}/coders/jnx.so @@ -892,6 +922,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/sfw.la %attr(755,root,root) %{modulesdir}/coders/sgi.so %{modulesdir}/coders/sgi.la +%attr(755,root,root) %{modulesdir}/coders/sixel.so +%{modulesdir}/coders/sixel.la %attr(755,root,root) %{modulesdir}/coders/stegano.so %{modulesdir}/coders/stegano.la %attr(755,root,root) %{modulesdir}/coders/sun.so @@ -918,6 +950,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/vid.la %attr(755,root,root) %{modulesdir}/coders/viff.so %{modulesdir}/coders/viff.la +%attr(755,root,root) %{modulesdir}/coders/vips.so +%{modulesdir}/coders/vips.la %attr(755,root,root) %{modulesdir}/coders/wbmp.so %{modulesdir}/coders/wbmp.la %attr(755,root,root) %{modulesdir}/coders/wpg.so @@ -934,6 +968,8 @@ rm -rf $RPM_BUILD_ROOT %{modulesdir}/coders/xps.la %attr(755,root,root) %{modulesdir}/coders/x.so %{modulesdir}/coders/x.la +%attr(755,root,root) %{modulesdir}/coders/xtrn.so +%{modulesdir}/coders/xtrn.la %attr(755,root,root) %{modulesdir}/coders/xwd.so %{modulesdir}/coders/xwd.la %attr(755,root,root) %{modulesdir}/coders/ycbcr.so @@ -944,30 +980,30 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{modulesdir}/filters/analyze.so %{modulesdir}/filters/analyze.la -%attr(755,root,root) %{_bindir}/animate -%attr(755,root,root) %{_bindir}/compare -%attr(755,root,root) %{_bindir}/composite -%attr(755,root,root) %{_bindir}/conjure -%attr(755,root,root) %{_bindir}/convert -%attr(755,root,root) %{_bindir}/display -%attr(755,root,root) %{_bindir}/identify -%attr(755,root,root) %{_bindir}/import -%attr(755,root,root) %{_bindir}/mogrify -%attr(755,root,root) %{_bindir}/montage -%attr(755,root,root) %{_bindir}/stream - -%{_mandir}/man1/ImageMagick.1* -%{_mandir}/man1/animate.1* -%{_mandir}/man1/compare.1* -%{_mandir}/man1/composite.1* -%{_mandir}/man1/convert.1* -%{_mandir}/man1/conjure.1* -%{_mandir}/man1/display.1* -%{_mandir}/man1/identify.1* -%{_mandir}/man1/import.1* -%{_mandir}/man1/mogrify.1* -%{_mandir}/man1/montage.1* -%{_mandir}/man1/stream.1* +%attr(755,root,root) %{_bindir}/animate6 +%attr(755,root,root) %{_bindir}/compare6 +%attr(755,root,root) %{_bindir}/composite6 +%attr(755,root,root) %{_bindir}/conjure6 +%attr(755,root,root) %{_bindir}/convert6 +%attr(755,root,root) %{_bindir}/display6 +%attr(755,root,root) %{_bindir}/identify6 +%attr(755,root,root) %{_bindir}/import6 +%attr(755,root,root) %{_bindir}/mogrify6 +%attr(755,root,root) %{_bindir}/montage6 +%attr(755,root,root) %{_bindir}/stream6 + +%{_mandir}/man1/ImageMagick6.1* +%{_mandir}/man1/animate6.1* +%{_mandir}/man1/compare6.1* +%{_mandir}/man1/composite6.1* +%{_mandir}/man1/convert6.1* +%{_mandir}/man1/conjure6.1* +%{_mandir}/man1/display6.1* +%{_mandir}/man1/identify6.1* +%{_mandir}/man1/import6.1* +%{_mandir}/man1/mogrify6.1* +%{_mandir}/man1/montage6.1* +%{_mandir}/man1/stream6.1* %files doc %defattr(644,root,root,755) @@ -976,10 +1012,10 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %doc ChangeLog LICENSE AUTHORS.txt -%attr(755,root,root) %{_libdir}/libMagickCore-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickCore-6.%{abisuf}.so.1 -%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagickWand-6.%{abisuf}.so.1 +%attr(755,root,root) %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagickCore-%{mver}.%{abisuf}.so.3 +%attr(755,root,root) %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagickWand-%{mver}.%{abisuf}.so.3 %dir %{_libdir}/ImageMagick-%{ver} %dir %{_libdir}/ImageMagick-%{ver}/config-%{abisuf} %{_libdir}/ImageMagick-%{ver}/config-%{abisuf}/configure.xml @@ -1031,10 +1067,10 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{modulesdir}/coders/jpeg.so %{modulesdir}/coders/jpeg.la -%if %{with jasper} +%if %{with openjpeg} %files coder-jpeg2 %defattr(644,root,root,755) -# R: jasper, libjpeg +# R: openjpeg2, libjpeg %attr(755,root,root) %{modulesdir}/coders/jp2.so %{modulesdir}/coders/jp2.la %endif @@ -1113,33 +1149,33 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%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) %{_libdir}/libMagickCore-6.%{abisuf}.so -%attr(755,root,root) %{_libdir}/libMagickWand-6.%{abisuf}.so -%dir %{_includedir}/ImageMagick-6 -%{_includedir}/ImageMagick-6/magick -%{_includedir}/ImageMagick-6/private -%{_includedir}/ImageMagick-6/wand -%{_pkgconfigdir}/ImageMagick-6.%{abisuf}.pc -%{_pkgconfigdir}/ImageMagick.pc -%{_pkgconfigdir}/MagickCore-6.%{abisuf}.pc -%{_pkgconfigdir}/MagickCore.pc -%{_pkgconfigdir}/MagickWand-6.%{abisuf}.pc -%{_pkgconfigdir}/MagickWand.pc -%{_pkgconfigdir}/Wand-6.%{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* +%attr(755,root,root) %{_bindir}/Magick6-config +%attr(755,root,root) %{_bindir}/MagickCore6-config +%attr(755,root,root) %{_bindir}/MagickWand6-config +%attr(755,root,root) %{_bindir}/Wand6-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 +%{_pkgconfigdir}/ImageMagick-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/ImageMagick6.pc +%{_pkgconfigdir}/MagickCore-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/MagickCore6.pc +%{_pkgconfigdir}/MagickWand-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/MagickWand6.pc +%{_pkgconfigdir}/Wand-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/Wand6.pc +%{_mandir}/man1/Magick6-config.1* +%{_mandir}/man1/MagickCore6-config.1* +%{_mandir}/man1/MagickWand6-config.1* +%{_mandir}/man1/Wand6-config.1* %files static %defattr(644,root,root,755) -%{_libdir}/libMagickCore-6.%{abisuf}.a -%{_libdir}/libMagickWand-6.%{abisuf}.a +%{_libdir}/libMagickCore-%{mver}.%{abisuf}.a +%{_libdir}/libMagickWand-%{mver}.%{abisuf}.a %files -n perl-%{name} %defattr(644,root,root,755) @@ -1148,11 +1184,9 @@ rm -rf $RPM_BUILD_ROOT %{perl_vendorarch}/Image/Magick/%{abisuf}.pm %dir %{perl_vendorarch}/auto/Image/Magick %{perl_vendorarch}/auto/Image/Magick/autosplit.ix -%{perl_vendorarch}/auto/Image/Magick/Magick.bs %attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/Magick.so %dir %{perl_vendorarch}/auto/Image/Magick/%{abisuf} %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/autosplit.ix -%{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.bs %attr(755,root,root) %{perl_vendorarch}/auto/Image/Magick/%{abisuf}/%{abisuf}.so %{_mandir}/man3/Image::Magick.3pm* %{_mandir}/man3/Image::Magick::%{abisuf}.3pm* @@ -1161,22 +1195,22 @@ rm -rf $RPM_BUILD_ROOT %if %{with cxx} %files c++ %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libMagick++-6.%{abisuf}.so.3 +%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libMagick++-%{mver}.%{abisuf}.so.7 %files c++-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/Magick++-config -%attr(755,root,root) %{_libdir}/libMagick++-6.%{abisuf}.so -%{_includedir}/ImageMagick-6/Magick++ -%{_includedir}/ImageMagick-6/Magick++.h -%{_pkgconfigdir}/ImageMagick++-6.%{abisuf}.pc -%{_pkgconfigdir}/ImageMagick++.pc -%{_pkgconfigdir}/Magick++-6.%{abisuf}.pc -%{_pkgconfigdir}/Magick++.pc -%{_mandir}/man1/Magick++-config.1* +%attr(755,root,root) %{_bindir}/Magick++6-config +%attr(755,root,root) %{_libdir}/libMagick++-%{mver}.%{abisuf}.so +%{_includedir}/%{pname}/Magick++ +%{_includedir}/%{pname}/Magick++.h +%{_pkgconfigdir}/ImageMagick++-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/ImageMagick++6.pc +%{_pkgconfigdir}/Magick++-%{mver}.%{abisuf}.pc +%{_pkgconfigdir}/Magick++6.pc +%{_mandir}/man1/Magick++6-config.1* %files c++-static %defattr(644,root,root,755) -%{_libdir}/libMagick++-6.%{abisuf}.a +%{_libdir}/libMagick++-%{mver}.%{abisuf}.a %endif