SPECS (DEVEL): kde4-kdebase-runtime.spec - exclude digikam icons (conflict ...

[shadzik]

Author: shadzik                      Date: Fri Jan 16 13:20:16 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- exclude digikam icons (conflict with digikam own ones)
- rel 3

---- Files affected:
SPECS:
   kde4-kdebase-runtime.spec (1.53.2.45 -> 1.53.2.46) 

---- Diffs:

================================================================
Index: SPECS/kde4-kdebase-runtime.spec
diff -u SPECS/kde4-kdebase-runtime.spec:1.53.2.45 SPECS/kde4-kdebase-runtime.spec:1.53.2.46
--- SPECS/kde4-kdebase-runtime.spec:1.53.2.45	Tue Jan 13 01:28:54 2009
+++ SPECS/kde4-kdebase-runtime.spec	Fri Jan 16 14:20:10 2009
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	Komponenty uruchomieniowe podstawowej części KDE 4
 Name:		kde4-kdebase-runtime
 Version:	4.1.96
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -495,6 +495,8 @@
 %dir %{_iconsdir}/oxygen/48x48
 %dir %{_iconsdir}/oxygen/64x64
 %dir %{_iconsdir}/oxygen/128x128
+# digikam has it's own icon in digikam.spec
+%exclude %{_iconsdir}/oxygen/*x*/apps/digikam.*
 %{_iconsdir}/oxygen/*x*/actions
 %{_iconsdir}/oxygen/*x*/apps
 %{_iconsdir}/oxygen/*x*/categories
@@ -510,6 +512,8 @@
 %files -n kde4-icons-oxygen-svg
 %defattr(644,root,root,755)
 %dir %{_iconsdir}/oxygen/scalable
+# digikam has it's own icon in digikam.spec
+%exclude %{_iconsdir}/oxygen/scalable/apps/digikam.*
 %{_iconsdir}/oxygen/scalable/text-formatting.svg
 %{_iconsdir}/oxygen/scalable/actions
 %{_iconsdir}/oxygen/scalable/apps
@@ -534,6 +538,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53.2.46  2009/01/16 13:20:10  shadzik
+- exclude digikam icons (conflict with digikam own ones)
+- rel 3
+
 Revision 1.53.2.45  2009/01/13 00:28:54  shadzik
 - updated strigi and phonon BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde4-kdebase-runtime.spec?r1=1.53.2.45&r2=1.53.2.46&f=u