rpms/kaffeine/devel kaffeine-0.8.7-epg.patch, NONE, 1.1 kaffeine.spec, 1.19, 1.20

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kaffeine.spec 
Added Files:
	kaffeine-0.8.7-epg.patch 
Log Message:
* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
- EPG and OSD patch (#452421).


kaffeine-0.8.7-epg.patch:

--- NEW FILE kaffeine-0.8.7-epg.patch ---
--- kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp.orig	2008-01-20 19:50:45.000000000 +0200
+++ kaffeine-0.8.7/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp	2008-08-30 10:15:10.000000000 +0300
@@ -171,10 +171,10 @@ EventSid *EventSource::getEventSid( int 
 		}
 	}
 	if ( !et ) {
-		if ( nid==0) {
-			mutex.unlock();
-			return 0;
-		}
+		// if ( nid==0) {
+		// 	mutex.unlock();
+		// 	return 0;
+		// }
 		et = new EventTsid( nid, tsid );
 		tsidList.append( et );
 	}


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kaffeine.spec	28 Aug 2008 19:28:48 -0000	1.19
+++ kaffeine.spec	6 Feb 2009 17:16:52 -0000	1.20
@@ -13,7 +13,7 @@
 #define nonfree 1
 
 Version: 0.8.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?nonfree:1} == 0 
 # Fedora Review: http://bugzilla.redhat.com/213432
@@ -31,6 +31,7 @@
 
 Patch0:  kaffeine-0.8.7-optflags.patch
 Patch1:  kaffeine-0.8.7-codecs.patch
+Patch2:  kaffeine-0.8.7-epg.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: gettext
@@ -107,6 +108,7 @@
 # FIXME
 #patch1 -p1 -b .codecs
 #sed -i -e "s|@libdir@|%{_libdir}|" kaffeine/src/instwizard.cpp
+%patch2 -p1 -b .epg
 
 # FIXME, must be a better workaround here
 sed -i -e 's|^ PACKAGE=kaffeine-.*| PACKAGE=kaffeine|' configure
@@ -226,6 +228,9 @@
 
 
 %changelog
+* Sat Aug 30 2008 Jussi Torhonen <jt at iki.fi> - 0.8.7-3
+- EPG and OSD patch (#452421).
+
 * Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.7-2
 - Unfuzz optflags patch.