rpms/digikam/devel digikam.spec,1.62,1.63

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	digikam.spec 
Log Message:
* Sat Aug 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.2.beta2
- omit conflicts with oxygen-icon-theme



Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- digikam.spec	1 Aug 2008 15:36:44 -0000	1.62
+++ digikam.spec	2 Aug 2008 17:43:57 -0000	1.63
@@ -2,7 +2,7 @@
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.2.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -106,6 +106,9 @@
 
 %find_lang %{name} || touch %{name}.lang
 
+# omit conflicts with oxygen-icon-theme
+rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/digikam.*
+
 
 %post
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
@@ -150,6 +153,9 @@
 
 
 %changelog
+* Sat Aug 02 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.2.beta2
+- omit conflicts with oxygen-icon-theme
+
 * Thu Jul 31 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.1.beta2
 - digikam-0.10.0-beta2