remove private header for koffice

[packages/ImageMagick.git] / ImageMagick.spec

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 9ff1b58bb1c7433056defd8bc4383234a77bd7db..68f54eec3d1c3ca85aa940376eace2f3aeeed4f6 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,12 +1,8 @@
 # TODO
-# - remove magick/quantum-private.h when koffice 1.6 is fixed not to use it
 # - unpackaged:
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/fd.la
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/fd.so
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/jnx.la
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/jnx.so
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/pango.la
-#        /usr/lib64/ImageMagick-6.7.9/modules-Q16/coders/pango.so
+# - pango (subpackage) DT_NEEDED: libpangocairo-1.0.so.0 libcairo.so.2 libpango-1.0.so.0 libgobject-2.0.so.0
+#        %{modulesdir}/coders/pango.la
+#        %{modulesdir}/coders/pango.so
 #
 # Conditional build:
 %bcond_without djvu            # without DJVU module
@@ -686,13 +682,11 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
        pkgdocdir=%{_docdir}/%{name}-doc-%{version}
 
 cp -p PerlMagick/demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-perl-%{version}
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{ver}/{ChangeLog,LICENSE,NEWS.txt}
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Image/Magick/.packlist
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# for koffice 1.6
-cp -a magick/quantum-private.h $RPM_BUILD_ROOT%{_includedir}/ImageMagick/magick
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -753,6 +747,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/ept.la
 %attr(755,root,root) %{modulesdir}/coders/fax.so
 %{modulesdir}/coders/fax.la
+%attr(755,root,root) %{modulesdir}/coders/fd.so
+%{modulesdir}/coders/fd.la
 %attr(755,root,root) %{modulesdir}/coders/fits.so
 %{modulesdir}/coders/fits.la
 %attr(755,root,root) %{modulesdir}/coders/gif.so
@@ -779,6 +775,8 @@ rm -rf $RPM_BUILD_ROOT
 %{modulesdir}/coders/inline.la
 %attr(755,root,root) %{modulesdir}/coders/ipl.so
 %{modulesdir}/coders/ipl.la
+%attr(755,root,root) %{modulesdir}/coders/jnx.so
+%{modulesdir}/coders/jnx.la
 %attr(755,root,root) %{modulesdir}/coders/label.so
 %{modulesdir}/coders/label.la
 %attr(755,root,root) %{modulesdir}/coders/mac.so