rpms/digikam/F-10 .cvsignore, 1.29, 1.30 digikam.spec, 1.75, 1.76 sources, 1.29, 1.30

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
* Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.15.rc1
- BR: kdeedu-devel >= 4.2.0, Req: kdeedu-marble >= 4.2.0
- add min Req: kdelibs4 dep too 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	5 Jan 2009 17:13:31 -0000	1.29
+++ .cvsignore	4 Feb 2009 20:31:01 -0000	1.30
@@ -1 +1 @@
-digikam-0.10.0-beta8.tar.bz2
+digikam-0.10.0-rc1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/digikam.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- digikam.spec	5 Jan 2009 17:13:31 -0000	1.75
+++ digikam.spec	4 Feb 2009 20:31:02 -0000	1.76
@@ -1,14 +1,14 @@
-%define beta beta8
+%define pre rc1 
 
 Name:	 digikam
 Version: 0.10.0
-Release: 0.12.%{beta}%{?dist}
+Release: 0.15.%{pre}%{?dist}
 Summary: A digital camera accessing & photo management application
 
 Group:	 Applications/Multimedia
 License: GPLv2+
 URL:	 http://www.digikam.org/
-Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.bz2
+Source0: http://downloads.sourceforge.net/digikam/digikam-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -19,18 +19,22 @@
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: jasper-devel
-## FIXME: marble integration, http://bugzilla.redhat.com/470578 
-#BuildRequires: marble-devel
+
+# marble integration, http://bugzilla.redhat.com/470578 
+BuildRequires: kdeedu-devel >= 4.2.0
+Requires: kdeedu-marble >= 4.2.0
+
 BuildRequires: kdelibs4-devel
-#global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.1.0") | grep ^KDE | cut -d' ' -f2)
+# Add min kdelibs Req, FIXME/TODO, come up with cleaner solution -- Rex
+%global kdelibs4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+Requires: kdelibs4 >= %{kdelibs4_version}
+
 BuildRequires: kdepimlibs-devel
 BuildRequires: lcms-devel
 BuildRequires: lensfun-devel
 BuildRequires: libtiff-devel
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: sqlite-devel
-# extraneous/bogus deps ?  -- Rex
-BuildRequires: giflib-devel openldap-devel pcre-devel
 
 Obsoletes: digikamimageplugins < 0.9.1-2
 
@@ -67,7 +71,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 
 %build
@@ -77,7 +81,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -150,6 +154,16 @@
 
 
 %changelog
+* Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.15.rc1
+- BR: kdeedu-devel >= 4.2.0, Req: kdeedu-marble >= 4.2.0
+- add min Req: kdelibs4 dep too 
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0-0.14.rc1
+- digikam-0.10.0-rc1
+
+* Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10-0.13.beta8
+- re-enable marble integration, kde42+ (bug #470578)
+
 * Mon Jan 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.10.0-0.12.beta8
 - digikam-0.10.0-beta8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	5 Jan 2009 17:13:31 -0000	1.29
+++ sources	4 Feb 2009 20:31:02 -0000	1.30
@@ -1 +1 @@
-1e256ed34d4d7d6b90def644b66f7fa9  digikam-0.10.0-beta8.tar.bz2
+08aaf686bb79ee7aade12075ddb2aca4  digikam-0.10.0-rc1.tar.bz2