SPECS: ImageMagick.spec - blah, I'm blind, removed braille, dds and xps cod...

[hawk]

Author: hawk                         Date: Tue May 27 10:30:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- blah, I'm blind, removed braille, dds and xps coder subpackages, they
  don't link with extra libs so they may be included in main package,
  fortunatelly they weren't built yet so no need for obsoletes
- added missing %dir
- release 2

---- Files affected:
SPECS:
   ImageMagick.spec (1.264 -> 1.265) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.264 SPECS/ImageMagick.spec:1.265
--- SPECS/ImageMagick.spec:1.264	Tue May 27 11:58:33 2008
+++ SPECS/ImageMagick.spec	Tue May 27 12:30:19 2008
@@ -25,7 +25,7 @@
 Summary(uk.UTF-8):	Перегляд, конвертування та обробка зображень під X Window
 Name:		ImageMagick
 Version:	%{ver}%{?pver:.%{pver}}
-Release:	1
+Release:	2
 Epoch:		1
 License:	Apache-like
 Group:		X11/Applications/Graphics
@@ -381,18 +381,6 @@
 Це окремий пакет зі статичними бібліотеками, які більше не входять до
 складу ImageMagick-c++-devel.
 
-%package coder-braille
-Summary:	Coder module for braille BRF files
-Summary(pl.UTF-8):	Moduł kodera dla plików braille BRF
-Group:		X11/Applications/Graphics
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description coder-braille
-Coder module for braille BRF files.
-
-%description coder-braille -l pl
-Moduł kodera dla plików braille BRF.
-
 %package coder-djvu
 Summary:	Coder module for DJVU files
 Summary(pl.UTF-8):	Moduł kodera dla plików DJVU
@@ -405,18 +393,6 @@
 %description coder-djvu -l pl
 Moduł kodera dla plików DJVU.
 
-%package coder-dds
-Summary:	Coder module for MS Direct Draw Surface files
-Summary(pl.UTF-8):	Moduł kodera dla plików MS Direct Draw Surface
-Group:		X11/Applications/Graphics
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description coder-dds
-Coder module for MS Direct Draw Surface files.
-
-%description coder-dds -l pl.UTF-8
-Moduł kodera dla plików MS Direct Draw Surface.
-
 %package coder-dot
 Summary:	Coder module for GraphViz DOT files
 Summary(pl.UTF-8):	Moduł kodera dla plików GraphViz DOT
@@ -601,18 +577,6 @@
 %description coder-wmf -l pl.UTF-8
 Moduł kodera dla plików WMF.
 
-%package coder-xps
-Summary:	Coder module for MS XML Paper Specification files
-Summary(pl.UTF-8):	Moduł kodera dla plików MS XML Paper Specification
-Group:		X11/Applications/Graphics
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description coder-xps
-Coder module for MS XML Paper Specification files.
-
-%description coder-xps -l pl.UTF-8
-Moduł kodera dla plików MS XML Paper Specification.
-
 %prep
 %setup -q -n %{name}-%{ver}
 %patch0 -p1
@@ -700,6 +664,8 @@
 %{modulesdir}/coders/avs.la
 %attr(755,root,root) %{modulesdir}/coders/bmp.so
 %{modulesdir}/coders/bmp.la
+%attr(755,root,root) %{modulesdir}/coders/braille.so
+%{modulesdir}/coders/braille.la
 %attr(755,root,root) %{modulesdir}/coders/caption.so
 %{modulesdir}/coders/caption.la
 %attr(755,root,root) %{modulesdir}/coders/cin.so
@@ -714,6 +680,8 @@
 %{modulesdir}/coders/cut.la
 %attr(755,root,root) %{modulesdir}/coders/dcm.so
 %{modulesdir}/coders/dcm.la
+%attr(755,root,root) %{modulesdir}/coders/dds.so
+%{modulesdir}/coders/dds.la
 %attr(755,root,root) %{modulesdir}/coders/dib.so
 %{modulesdir}/coders/dib.la
 %attr(755,root,root) %{modulesdir}/coders/dng.so
@@ -850,6 +818,8 @@
 %{modulesdir}/coders/xc.la
 %attr(755,root,root) %{modulesdir}/coders/xpm.so
 %{modulesdir}/coders/xpm.la
+%attr(755,root,root) %{modulesdir}/coders/xps.so
+%{modulesdir}/coders/xps.la
 %attr(755,root,root) %{modulesdir}/coders/x.so
 %{modulesdir}/coders/x.la
 %attr(755,root,root) %{modulesdir}/coders/xwd.so
@@ -897,12 +867,6 @@
 %attr(755,root,root) %{_libdir}/libMagickCore.so.*.*.*
 %attr(755,root,root) %{_libdir}/libMagickWand.so.*.*.*
 
-%files coder-braille
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/braille.so
-%{modulesdir}/coders/braille.la
-
 %if %{with djvu}
 %files coder-djvu
 %defattr(644,root,root,755)
@@ -917,12 +881,6 @@
 %attr(755,root,root) %{modulesdir}/coders/dot.so
 %{modulesdir}/coders/dot.la
 
-%files coder-dds
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/dds.so
-%{modulesdir}/coders/dds.la
-
 %if %{with exr}
 %files coder-exr
 %defattr(644,root,root,755)
@@ -1019,12 +977,6 @@
 %{modulesdir}/coders/wmf.la
 %endif
 
-%files coder-xps
-%defattr(644,root,root,755)
-# R: expat, libjpeg, libtiff, libbz2, libxcb, zlib
-%attr(755,root,root) %{modulesdir}/coders/xps.so
-%{modulesdir}/coders/xps.la
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/Magick-config
@@ -1033,6 +985,7 @@
 %attr(755,root,root) %{_bindir}/Wand-config
 %attr(755,root,root) %{_libdir}/libMagickCore.so
 %attr(755,root,root) %{_libdir}/libMagickWand.so
+%dir %{_includedir}/ImageMagick
 %{_libdir}/libMagickCore.la
 %{_libdir}/libMagickWand.la
 %{_includedir}/ImageMagick/magick
@@ -1088,6 +1041,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.265  2008-05-27 10:30:19  hawk
+- blah, I'm blind, removed braille, dds and xps coder subpackages, they
+  don't link with extra libs so they may be included in main package,
+  fortunatelly they weren't built yet so no need for obsoletes
+- added missing %dir
+- release 2
+
 Revision 1.264  2008-05-27 09:58:33  hawk
 - BR: autoconf >= 2.62-1, fails with older versions
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ImageMagick.spec?r1=1.264&r2=1.265&f=u