rpms/kaffeine/F-12 kaffeine.spec, 1.32, 1.33 kaffeine-1.0-pre3-deinterlace-optional.patch, 1.1, NONE kaffeine-1.0-pre3-mkfifo.patch.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kaffeine.spec 
Removed Files:
	kaffeine-1.0-pre3-deinterlace-optional.patch 
	kaffeine-1.0-pre3-mkfifo.patch.patch 
Log Message:
* Mon Jun 21 2010 Rex Dieter <rdieter at fedoraproject.org> 1.0-3
- Unexpanded macro in kdelibs4 dependency (#606134)
- remove old/unused patches



Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-12/kaffeine.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kaffeine.spec	20 Jun 2010 20:57:24 -0000	1.32
+++ kaffeine.spec	21 Jun 2010 12:28:28 -0000	1.33
@@ -1,6 +1,7 @@
+
 Name:    kaffeine
-Version: 1.0 
-Release: 1%{?dist}
+Version: 1.0
+Release: 3%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
@@ -9,11 +10,12 @@ URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: xine-lib-devel
-BuildRequires: libXScrnSaver-devel
+BuildRequires: xine-lib-devel libXScrnSaver-devel
 
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
@@ -25,7 +27,8 @@ Kaffeine is a KDE media player.
 
 
 %prep
-%setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
+%setup -q -n kaffeine-%{version}
+
 
 %build
 mkdir -p %{_target_platform}
@@ -81,14 +84,22 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_appsdir}/profiles/kaffeine.profile.xml
 
+
 %changelog
-* Thu Jun 03 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-1
+* Mon Jun 21 2010 Rex Dieter <rdieter at fedoraproject.org> 1.0-3
+- Unexpanded macro in kdelibs4 dependency (#606134)
+- remove old/unused patches
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-2
+- removed Require libXss, added BR libXss-devel
+
+* Tue Jun 01 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-1
 - kaffeine 1.0
-- new dep libXss-devel
+- new dep libXss
 - 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
+- deinterlace-optional patch thanks to Kevin Kofler
 
 * Mon Feb 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.4.pre3
 - kaffeine-1.0-pre3


--- kaffeine-1.0-pre3-deinterlace-optional.patch DELETED ---


--- kaffeine-1.0-pre3-mkfifo.patch.patch DELETED ---