rpms/kphotoalbum/F-11 .cvsignore, 1.16, 1.17 kphotoalbum.spec, 1.40, 1.41 sources, 1.15, 1.16

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kphotoalbum/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4857/F-11

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Log Message:
* Wed Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-5
 touchup marble deps



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	7 Aug 2009 14:11:09 -0000	1.16
+++ .cvsignore	10 Feb 2010 19:44:22 -0000	1.17
@@ -1 +1 @@
-kphotoalbum-4.0.2.tar.bz2
+kphotoalbum-4.1.1.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/kphotoalbum.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- kphotoalbum.spec	23 Dec 2009 01:12:53 -0000	1.40
+++ kphotoalbum.spec	10 Feb 2010 19:44:22 -0000	1.41
@@ -2,7 +2,7 @@
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia 
@@ -22,10 +22,8 @@ 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}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
+Requires: kdeedu-marble%{?_isa}%{?_kde4_version: >= %{_kde4_version}} 
 
 %description
 A photo album tool. Focuses on three key points:
@@ -92,6 +90,15 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Wed Feb 10 2010 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-5
+ touchup marble deps
+
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-4
+- use %%{_kde4_version}
+
+* Mon Jan 03 2010 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-3
+- rebuild (exiv2)
+
 * Wed Nov 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-1
 - kphotoalbum-4.1.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	7 Aug 2009 14:11:10 -0000	1.15
+++ sources	10 Feb 2010 19:44:22 -0000	1.16
@@ -1 +1 @@
-2a01730dd3f0c14827c8ab3921fc64c2  kphotoalbum-4.0.2.tar.bz2
+c00a5f179e487ac89fccf8dfb3cd6ef0  kphotoalbum-4.1.1.tar.bz2