From a8736f71c4ef96ea8c72824b5532a984d6134c91 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 11 Sep 2011 02:41:20 +0000 Subject: [PATCH] --- ImageMagick.spec.in | 21 ++++++++------------- MagickWand/Wand.pc.in | 11 ----------- 2 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 MagickWand/Wand.pc.in diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index 7b8fc7fa6..0d934364c 100644 --- a/ImageMagick.spec.in +++ b/ImageMagick.spec.in @@ -252,8 +252,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc QuickStart.txt ChangeLog Platforms.txt %doc README.txt LICENSE NOTICE AUTHORS.txt NEWS.txt -%{_libdir}/libMagickCore.so.* -%{_libdir}/libMagickWand.so.* +%{_libdir}/libMagickCore.so* +%{_libdir}/libMagickWand.so* %{_bindir}/[a-z]* %{_sysconfdir}/%{name} %{_libdir}/%{name}-%{VERSION} @@ -266,21 +266,16 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %{_bindir}/MagickCore-config -%{_bindir}/Magick-config %{_bindir}/MagickWand-config -%{_bindir}/Wand-config -%{_libdir}/libMagickCore.so -%{_libdir}/libMagickWand.so +%{_libdir}/libMagickCore.so* +%{_libdir}/libMagickWand.so* %{_libdir}/pkgconfig/MagickCore.pc %{_libdir}/pkgconfig/ImageMagick.pc %{_libdir}/pkgconfig/MagickWand.pc -%{_libdir}/pkgconfig/Wand.pc %dir %{_includedir}/%{name} -%{_includedir}/%{name}/magick -%{_includedir}/%{name}/wand -%{_mandir}/man1/Magick-config.* +%{_includedir}/%{name}/MagickCore +%{_includedir}/%{name}/MagickWand %{_mandir}/man1/MagickCore-config.* -%{_mandir}/man1/Wand-config.* %{_mandir}/man1/MagickWand-config.* %files djvu @@ -296,7 +291,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc Magick++/AUTHORS Magick++/ChangeLog Magick++/NEWS Magick++/README %doc www/Magick++/COPYING -%{_libdir}/libMagick++.so.* +%{_libdir}/libMagick++.so* %files c++-devel %defattr(-,root,root,-) @@ -304,7 +299,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/Magick++-config %{_includedir}/%{name}/Magick++ %{_includedir}/%{name}/Magick++.h -%{_libdir}/libMagick++.so +%{_libdir}/libMagick++.so* %{_libdir}/pkgconfig/Magick++.pc %{_libdir}/pkgconfig/ImageMagick++.pc %{_mandir}/man1/Magick++-config.* diff --git a/MagickWand/Wand.pc.in b/MagickWand/Wand.pc.in deleted file mode 100644 index f3ab2a030..000000000 --- a/MagickWand/Wand.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/ImageMagick - -Name: Wand -Version: @PACKAGE_VERSION@ -Description: MagickWand - C API for ImageMagick -Requires: ImageMagick -Libs: -L${libdir} -lMagickWand -lMagickCore -Cflags: -I${includedir} @MAGICK_PCFLAGS@ -- 2.40.0