rpms/digikam/F-10 .cvsignore, 1.27, 1.28 digikam.spec, 1.71, 1.72 sources, 1.27, 1.28

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/digikam/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2012

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.9.beta7
- digikam-0.10.0-beta7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	29 Nov 2008 11:24:59 -0000	1.27
+++ .cvsignore	19 Dec 2008 17:30:12 -0000	1.28
@@ -1 +1 @@
-digikam-0.10.0-beta6.tar.bz2
+digikam-0.10.0-beta7.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- digikam.spec	29 Nov 2008 11:25:00 -0000	1.71
+++ digikam.spec	19 Dec 2008 17:30:13 -0000	1.72
@@ -1,8 +1,8 @@
-%define beta beta6
+%define beta beta7
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.7.%{beta}%{?dist}
+Release: 0.9.%{beta}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
@@ -20,8 +20,9 @@
 BuildRequires: libkipi-devel >= 0.2.0
 BuildRequires: jasper-devel
 ## FIXME: marble integration, http://bugzilla.redhat.com/470578 
-#BuildRequires: kdeedu4-devel
+#BuildRequires: marble-devel
 BuildRequires: kdelibs4-devel
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.1.0") | grep ^KDE | cut -d' ' -f2)
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
 BuildRequires: lensfun-devel
@@ -97,7 +98,12 @@
 %find_lang %{name} || touch %{name}.lang
 
 # omit conflicts with oxygen-icon-theme
-rm -f %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/digikam.*
+rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/apps/digikam.*
+%if "%{kdelibs4_version}" >= "4.2.0"
+rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/transform-crop-and-resize.png
+rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/view-object-histogram-logarithmic.png
+rm -vf %{buildroot}%{_kde4_iconsdir}/oxygen/*/actions/view-object-histogram-linear.png
+%endif
 
 
 %post
@@ -143,6 +149,12 @@
 
 
 %changelog
+* Thu Dec 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.9.beta7
+- digikam-0.10.0-beta7
+
+* Mon Dec 01 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.8.beta6
+- omit kde42 (icon) conflicts
+
 * Tue Nov 25 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.7.beta6
 - digikam-0.10.0-beta6
 - lensfun support


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	29 Nov 2008 11:25:00 -0000	1.27
+++ sources	19 Dec 2008 17:30:13 -0000	1.28
@@ -1 +1 @@
-e9614d54efa279f108f74bed1ddbef80  digikam-0.10.0-beta6.tar.bz2
+81b4ab94d9312d685e21796829aa31f9  digikam-0.10.0-beta7.tar.bz2