packages: libwmf/libwmf.spec - gtk+2 loaders are now stored in %{_libdir}/g...

[lisu]

Author: lisu                         Date: Fri Feb 18 09:32:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gtk+2 loaders are now stored in %{_libdir}/gdk-pixbuf-2.0/*/loaders/
- use __rm macro
- LDFLAGS passed with configure script
- rel 16

---- Files affected:
packages/libwmf:
   libwmf.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/libwmf/libwmf.spec
diff -u packages/libwmf/libwmf.spec:1.100 packages/libwmf/libwmf.spec:1.101
--- packages/libwmf/libwmf.spec:1.100	Fri Feb 11 10:23:15 2011
+++ packages/libwmf/libwmf.spec	Fri Feb 18 10:32:05 2011
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	libwmf - biblioteka z funkcjami do konwersji plików WMF
 Name:		libwmf
 Version:	0.2.8.4
-Release:	15
+Release:	16
 Epoch:		2
 License:	LGPL v2+
 Group:		Applications/Text
@@ -26,6 +26,7 @@
 Patch9:		%{name}-0.2.8.4-CVE-2007-2756.patch
 Patch10:	%{name}-0.2.8.4-CAN-2004-0941.patch
 Patch11:	%{name}-0.2.8.4-CVE-2009-3546.patch
+Patch12:	%{name}-pixbufloaderdir.patch
 URL:		http://wvware.sourceforge.net/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
@@ -121,15 +122,15 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %build
-rm configure.in
+%{__rm} configure.in
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-LDFLAGS="%{rpmldflags} -Wl,--as-needed"
 %configure \
 	%{!?with_static_libs:--disable-static} \
 	--with-sysfontmap=%{_fontsdir}/ghostscript-fonts-std.font \
@@ -144,11 +145,11 @@
 %{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -rf html-doc
+%{__rm} -rf html-doc
 mv -f $RPM_BUILD_ROOT%{_datadir}/doc ./html-doc
 
 # no static modules and *.la for GTK+ loaders - shut up check-files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2*/*/loaders/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -199,7 +200,7 @@
 %if %{with gtk}
 %files gtk-loader
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gtk-2.0/*/loaders/io-wmf.so
+%{_libdir}/gdk-pixbuf-2.0/*/loaders/io-wmf.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -208,6 +209,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2011/02/18 09:32:05  lisu
+- gtk+2 loaders are now stored in %{_libdir}/gdk-pixbuf-2.0/*/loaders/
+- use __rm macro
+- LDFLAGS passed with configure script
+- rel 16
+
 Revision 1.100  2011/02/11 09:23:15  lisu
 - rel 15 (new gtk+2)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libwmf/libwmf.spec?r1=1.100&r2=1.101&f=u