rpms/libkipi/F-9 .cvsignore, 1.6, 1.7 libkipi.spec, 1.17, 1.18 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore libkipi.spec sources 
Log Message:
sync w/devel (libkipi-0.1.6)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Dec 2006 10:51:46 -0000	1.6
+++ .cvsignore	17 Jul 2008 14:20:52 -0000	1.7
@@ -1 +1 @@
-libkipi-0.1.5.tar.bz2
+libkipi-0.1.6.tar.bz2


Index: libkipi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/F-9/libkipi.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libkipi.spec	22 Feb 2008 14:33:49 -0000	1.17
+++ libkipi.spec	17 Jul 2008 14:20:52 -0000	1.18
@@ -1,13 +1,18 @@
 
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
 Name:           libkipi
-Version:        0.1.5
-Release:        4%{?dist}
+Version:        0.1.6
+Release:        2%{?dist}
 Summary:        Common plugin infrastructure for KDE image applications
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://extragear.kde.org/apps/kipi
-Source0:        http://downloads.sf.net/kipi/libkipi-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/kipi/libkipi-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -55,6 +60,9 @@
 
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%if 0%{?nuke_icons}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+%endif
 
 
 %clean
@@ -63,31 +71,43 @@
 
 %post 
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 %postun
 /sbin/ldconfig
+%if ! 0%{?nuke_icons}
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%endif
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
-%{_libdir}/lib*.so.*
+%{_libdir}/libkipi.so.0*
 %{_datadir}/apps/kipi/
+%if ! 0%{?nuke_icons}
 %{_datadir}/icons/hicolor/*/*/*
+%endif
 %{_datadir}/servicetypes/*.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so
+%{_libdir}/libkipi.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/libkipi/
 
 
 %changelog
+* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
+- fix conflicts with kdegraphics (f9+, #452392)
+
+* Fri May 08 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-1
+- libkipi-0.1.6
+
 * Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.5-4
 - cleanup, fixup for rawhide (#433965)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2006 10:51:46 -0000	1.6
+++ sources	17 Jul 2008 14:20:52 -0000	1.7
@@ -1 +1 @@
-aef790871583444cd81bd9dea9c3fd0b  libkipi-0.1.5.tar.bz2
+6fd010aa8eab7039143f69543e806c65  libkipi-0.1.6.tar.bz2