SPECS: ImageMagick.spec - ImageMagick-ldflags.patch: filter out ld...

[qrczak]

Author: qrczak                       Date: Sun Feb 25 19:55:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ImageMagick-ldflags.patch: filter out ldflags only for *-config,
  not for building. Filter out -Wl,--as-needed too.
- Fixed djvu files list.
- Release 2

---- Files affected:
SPECS:
   ImageMagick.spec (1.249 -> 1.250) 

---- Diffs:

================================================================
Index: SPECS/ImageMagick.spec
diff -u SPECS/ImageMagick.spec:1.249 SPECS/ImageMagick.spec:1.250
--- SPECS/ImageMagick.spec:1.249	Sat Feb 24 22:09:41 2007
+++ SPECS/ImageMagick.spec	Sun Feb 25 20:55:41 2007
@@ -24,7 +24,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
@@ -35,6 +35,7 @@
 Patch1:		%{name}-system-libltdl.patch
 Patch2:		%{name}-link.patch
 Patch3:		%{name}-libpath.patch
+Patch4:		%{name}-ldflags.patch
 URL:		http://www.imagemagick.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1:1.9
@@ -68,8 +69,6 @@
 Obsoletes:	ImageMagick-coder-mpeg
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# we don't want "-s" here, because it would be added to `Magick*-config --ldflags`
-%define		filterout_ld	(-Wl,)?-s (-Wl,)?--strip-all
 %define		modulesdir	%{_libdir}/ImageMagick-%{ver}/modules-Q%{QuantumDepth}
 
 %description
@@ -570,6 +569,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__perl} -pi -e 's,lib/graphviz,%{_lib}/graphviz,' configure.ac
 find -type f -exec perl -pi -e 's=!/usr/local/bin/perl=!/usr/bin/perl='  {} \;
@@ -843,7 +843,7 @@
 %attr(755,root,root) %{_libdir}/libWand.so.*.*.*
 
 %if %{with djvu}
-%files coder-dot
+%files coder-djvu
 %defattr(644,root,root,755)
 # R: djvulibre
 %attr(755,root,root) %{modulesdir}/coders/djvu.so
@@ -1001,6 +1001,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2007/02/25 19:55:41  qrczak
+- ImageMagick-ldflags.patch: filter out ldflags only for *-config,
+  not for building. Filter out -Wl,--as-needed too.
+- Fixed djvu files list.
+- Release 2
+
 Revision 1.249  2007/02/24 21:09:41  qboosh
 - package djvu coder
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ImageMagick.spec?r1=1.249&r2=1.250&f=u