rpms/libkdcraw/devel libkdcraw.spec,1.10,1.11

[Marcin Garski (mgarski)]

Author: mgarski

Update of /cvs/pkgs/rpms/libkdcraw/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9162

Modified Files:
	libkdcraw.spec 
Log Message:
- Fix conflicts with kde-l10n (#457503)



Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/devel/libkdcraw.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libkdcraw.spec	24 Jun 2008 18:47:24 -0000	1.10
+++ libkdcraw.spec	1 Aug 2008 17:21:03 -0000	1.11
@@ -1,12 +1,12 @@
 
 %if 0%{?fedora} > 8
-# see http://bugzilla.redhat.com/452392
-%define nuke_icons 1
+# see http://bugzilla.redhat.com/452392 and http://bugzilla.redhat.com/457503
+%define nuke_icons_and_lang 1
 %endif
 
 Name:		libkdcraw
 Version:	0.1.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -49,7 +49,6 @@
 
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -57,14 +56,15 @@
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
-%if 0%{?nuke_icons}
+%if 0%{?nuke_icons_and_lang}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/
 %endif
 
 
 %post
 /sbin/ldconfig
-%if ! 0%{?nuke_icons}
+%if ! 0%{?nuke_icons_and_lang}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -73,7 +73,7 @@
 
 %postun
 /sbin/ldconfig
-%if ! 0%{?nuke_icons}
+%if ! 0%{?nuke_icons_and_lang}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -84,13 +84,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
+%if ! 0%{?nuke_icons_and_lang}
 %files -f %{name}.lang
+%else
+%files
+%endif
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
 %{_libdir}/libkdcraw3/
-%if ! 0%{?nuke_icons}
+%if ! 0%{?nuke_icons_and_lang}
 %{_datadir}/icons/hicolor/*/*/*
 %endif
 
@@ -102,6 +105,9 @@
 
 
 %changelog
+* Fri Aug 01 2008 Marcin Garski <mgarski[AT]post.pl> 0.1.4-3
+- Fix conflicts with kde-l10n (#457503)
+
 * Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-2
 - fix conflicts with kdegraphics (f9+, #452392)