rpms/kphotoalbum/devel kphotoalbum.spec,1.40,1.41

Rex Dieter rdieter at fedoraproject.org
Fri Aug 7 14:09:24 UTC 2009


Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7100

Modified Files:
	kphotoalbum.spec 
Log Message:
add marble, kdelibs4 deps



Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/devel/kphotoalbum.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kphotoalbum.spec	29 Jul 2009 22:10:26 -0000	1.40
+++ kphotoalbum.spec	7 Aug 2009 14:09:23 -0000	1.41
@@ -8,21 +8,25 @@ License: GPLv2+
 Group:   Applications/Multimedia 
 URL:	 http://kphotoalbum.org/
 Source0:  http://kphotoalbum.org/data/download/kphotoalbum-%{version}.tar.bz2
-#Source0: http://kphotoalbum.org/data/snapshots/kphotoalbum-%{pre}.tar.bz2
-#Source0: kphotoalbum-%{pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
 BuildRequires: exiv2-devel
 BuildRequires: gettext
 # marble integration
-BuildRequires: kdeedu-devel >= 4.2.0
+%define marble_version 4.3.0
+BuildRequires: kdeedu-devel >= %{marble_version} 
 BuildRequires: kdelibs4-devel
 BuildRequires: libkdcraw-devel >= 0.4.0
 BuildRequires: libkexiv2-devel >= 0.5.0
 BuildRequires: libkipi-devel >= 0.3.0
 BuildRequires: soprano-devel
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.2.0") | grep ^KDE | cut -d' ' -f2)
+
+Requires: kdelibs4%{?_isa} >= %{kde4_version}
+Requires: kdeedu-marble%{?_isa} >= %{marble_version}
+
 %description
 A photo album tool. Focuses on three key points:
   * It must be easy to describe a number of images at a time. 




More information about the fedora-extras-commits mailing list