rpms/libkipi/devel libkipi.spec,1.18,1.19
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jun 24 18:42:27 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/libkipi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2494
Modified Files:
libkipi.spec
Log Message:
* Tue Jun 24 2008 Rex Dieter <rdieter at fedoraproject.org> 0.1.6-2
- fix conflicts with kdegraphics (f9+, #452392)
Index: libkipi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libkipi/devel/libkipi.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libkipi.spec 8 May 2008 12:16:18 -0000 1.18
+++ libkipi.spec 24 Jun 2008 18:41:31 -0000 1.19
@@ -1,7 +1,12 @@
+%if 0%{?fedora} > 8
+# see http://bugzilla.redhat.com/452392
+%define nuke_icons 1
+%endif
+
Name: libkipi
Version: 0.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Common plugin infrastructure for KDE image applications
Group: System Environment/Libraries
@@ -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,13 +71,17 @@
%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
@@ -77,7 +89,9 @@
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/libkipi.so.0*
%{_datadir}/apps/kipi/
+%if ! 0%{?nuke_icons}
%{_datadir}/icons/hicolor/*/*/*
+%endif
%{_datadir}/servicetypes/*.desktop
%files devel
@@ -88,6 +102,9 @@
%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
More information about the scm-commits
mailing list