rpms/kaffeine/F-13 .cvsignore, 1.10, 1.11 kaffeine.spec, 1.31, 1.32 sources, 1.10, 1.11

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/kaffeine/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25949

Modified Files:
	.cvsignore kaffeine.spec sources 
Log Message:
kaffeine 1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-13/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	8 Feb 2010 18:45:28 -0000	1.10
+++ .cvsignore	1 Jun 2010 16:59:26 -0000	1.11
@@ -1 +1 @@
-kaffeine-1.0-pre3.tar.gz
+kaffeine-1.0.tar.gz


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-13/kaffeine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- kaffeine.spec	15 Apr 2010 20:17:02 -0000	1.31
+++ kaffeine.spec	1 Jun 2010 16:59:26 -0000	1.32
@@ -1,25 +1,18 @@
-
-%define pre pre3
-
 Name:    kaffeine
 Version: 1.0 
-Release: 0.5.%{pre}%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
-Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-## upstreamable patches
-Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
-Patch60: kaffeine-1.0-pre3-deinterlace-optional.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel
+BuildRequires: xine-lib-devel libXScrnSaver-devel
 
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
@@ -31,10 +24,7 @@ Kaffeine is a KDE media player.
 
 
 %prep
-%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
-
-%patch50 -p1 -b .mkfifo
-%patch60 -p1
+%setup -q -n kaffeine-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -88,10 +78,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/kaffeine.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
-%{_kde4_libdir}/kde4/kaffeinedvb.so
-
+%{_kde4_appsdir}/profiles/kaffeine.profile.xml
 
 %changelog
+* Tue Jun 01 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-1
+- kaffeine 1.0
+- new dep libXss-devel
+- lots of improvements and bugfixes
+
 * Thu Apr 15 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-0.5.pre3
 - added kaffeine-1.0-pre3-deinterlace-optional.patch thanks to Kevin Kofler
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-13/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	8 Feb 2010 18:45:28 -0000	1.10
+++ sources	1 Jun 2010 16:59:26 -0000	1.11
@@ -1 +1 @@
-919e29a95b599db5eef74b5983f135f4  kaffeine-1.0-pre3.tar.gz
+81bac76f931245a75f20ed26a37c55e3  kaffeine-1.0.tar.gz