rpms/kaffeine/devel .cvsignore, 1.8, 1.9 kaffeine.spec, 1.27, 1.28 sources, 1.8, 1.9

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.3.pre2
- kaffeine-1.0-pre2
- update %description/%summary
- %check: use desktop-file-validate



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	26 Apr 2009 19:41:58 -0000	1.8
+++ .cvsignore	14 Aug 2009 13:38:15 -0000	1.9
@@ -1 +1 @@
-kaffeine-1.0-pre1.tar.gz
+kaffeine-1.0-pre2.tar.gz


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- kaffeine.spec	25 Jul 2009 04:17:07 -0000	1.27
+++ kaffeine.spec	14 Aug 2009 13:38:15 -0000	1.28
@@ -1,19 +1,18 @@
 
-%define pre pre1
+%define pre pre2
 
 Name:    kaffeine
 Version: 1.0 
-Release: 0.2.%{pre}%{?dist}
+Release: 0.3.%{pre}%{?dist}
 
 License: GPLv2+
-Summary: Xine-based media player
+Summary: Phonon-based media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: kaffeine-1.0-pre1-kernel_headers.patch
-
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
 BuildRequires: phonon-devel
@@ -22,14 +21,12 @@ Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
 %description
-Kaffeine is a xine-based media player for KDE.
+Kaffeine is a phonon-based media player.
 
 
 %prep
 %setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
 
-%patch1 -p1 -b .kernel_headers
-
 
 %build
 mkdir -p %{_target_platform}
@@ -50,8 +47,12 @@ mv %{buildroot}%{_kde4_iconsdir}/oxygen 
 %find_lang %{name}
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+
+
 %clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
 
 
 %post
@@ -73,13 +74,19 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING TODO
 %{_kde4_bindir}/kaffeine
-%{_kde4_datadir}/applications/kde4/*.desktop
 %{_kde4_appsdir}/kaffeine/
 %{_kde4_appsdir}/solid/actions/*.desktop
+%{_kde4_datadir}/applications/kde4/kaffeine.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_libdir}/kde4/kaffeinedvb.so
 
 
 %changelog
+* Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.3.pre2
+- kaffeine-1.0-pre2
+- update %%description/%%summary
+- %%check: use desktop-file-validate
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-0.2.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	26 Apr 2009 19:41:58 -0000	1.8
+++ sources	14 Aug 2009 13:38:15 -0000	1.9
@@ -1 +1 @@
-ecae6fd84103a268daf17b61784d837f  kaffeine-1.0-pre1.tar.gz
+24eee004427d6b3f73ffb85a94fc6e3b  kaffeine-1.0-pre2.tar.gz