rpms/libkdcraw/F-9 .cvsignore, 1.6, 1.7 libkdcraw.spec, 1.9, 1.10 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libkdcraw/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14347

Modified Files:
	.cvsignore libkdcraw.spec sources 
Log Message:
revert to match reality, + fix conflicts with future kdegraphics update



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Mar 2008 17:51:35 -0000	1.6
+++ .cvsignore	24 Jun 2008 19:57:09 -0000	1.7
@@ -1 +1 @@
-libkdcraw-0.1.4.tar.bz2
+libkdcraw-0.1.3.tar.bz2


Index: libkdcraw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/libkdcraw.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libkdcraw.spec	14 Mar 2008 17:51:35 -0000	1.9
+++ libkdcraw.spec	24 Jun 2008 19:57:09 -0000	1.10
@@ -1,7 +1,12 @@
 
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:		libkdcraw
-Version:	0.1.4
-Release:	1%{?dist}
+Version:	0.1.3
+Release:	2%{?dist}.1
 Summary:	A library for decoding RAW picture files
 
 Group:		Applications/Multimedia
@@ -41,8 +46,10 @@
 	--enable-final \
 	--enable-new-ldflags \
 	--disable-warnings
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -50,32 +57,42 @@
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libkdcraw.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
+
 
 %post
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
 
 %postun
 /sbin/ldconfig
-
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
 	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %name.lang
+
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/libkdcraw.so.*
-%{_libdir}/libkdcraw3/
+%{_libdir}/libkdcraw2/
+%if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -83,9 +100,10 @@
 %{_libdir}/pkgconfig/libkdcraw.pc
 %{_libdir}/libkdcraw.so
 
+
 %changelog
-* Wed Mar 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.4-1
-- libkdcraw-0.1.4
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.3-2.1
+- fix conflicts with kdegraphics (f9+, #452392)
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.1.3-2
 - Autorebuild for GCC 4.3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkdcraw/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Mar 2008 17:51:35 -0000	1.6
+++ sources	24 Jun 2008 19:57:09 -0000	1.7
@@ -1 +1 @@
-4fa5de407e9acf2eb5650d3fb5836f7d  libkdcraw-0.1.4.tar.bz2
+dc4772804c17d7eff4f913048b8e1c3c  libkdcraw-0.1.3.tar.bz2