rpms/kphotoalbum/F-10 .cvsignore, 1.14, 1.15 kphotoalbum.spec, 1.34, 1.35 sources, 1.13, 1.14

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


Author: rdieter

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

Modified Files:
	.cvsignore kphotoalbum.spec sources 
Log Message:
4.0.2 goodness (and rebuild against kde-4.3.0)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	22 May 2009 17:09:45 -0000	1.14
+++ .cvsignore	7 Aug 2009 14:11:09 -0000	1.15
@@ -1 +1 @@
-kphotoalbum-4.0.1.tar.bz2
+kphotoalbum-4.0.2.tar.bz2


Index: kphotoalbum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/kphotoalbum.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- kphotoalbum.spec	22 May 2009 17:09:45 -0000	1.34
+++ kphotoalbum.spec	7 Aug 2009 14:11:09 -0000	1.35
@@ -1,30 +1,31 @@
 
 Summary: KDE Photo Album 
 Name:	 kphotoalbum
-Version: 4.0.1
+Version: 4.0.2
 Release: 1%{?dist}
 
 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
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
+%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:
@@ -83,12 +84,18 @@ rm -rf %{buildroot} 
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||: 
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null ||:
-xdg-desktop-menu forceupdate 2> /dev/null ||:
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -102,6 +109,12 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-1
+- kphotoalbum-4.0.2
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri May 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0.1-1
 - kphotoalbum-4.0.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kphotoalbum/F-10/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	22 May 2009 17:09:45 -0000	1.13
+++ sources	7 Aug 2009 14:11:09 -0000	1.14
@@ -1 +1 @@
-00879c947585bc17a84d84cd3af417a5  kphotoalbum-4.0.1.tar.bz2
+2a01730dd3f0c14827c8ab3921fc64c2  kphotoalbum-4.0.2.tar.bz2




More information about the fedora-extras-commits mailing list