rpms/vdr-sudoku/devel vdr-sudoku-0.2.0-exit-crash.patch, NONE, 1.1 vdr-sudoku.spec, 1.7, 1.8 vdr-sudoku-0.2.0-no-exit.patch, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Tue Mar 25 16:30:40 UTC 2008


Author: scop

Update of /cvs/pkgs/rpms/vdr-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21759

Modified Files:
	vdr-sudoku.spec 
Added Files:
	vdr-sudoku-0.2.0-exit-crash.patch 
Removed Files:
	vdr-sudoku-0.2.0-no-exit.patch 
Log Message:
* Tue Mar 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.2.0-2
- Apply upstream fix for OSD crash after exit.


vdr-sudoku-0.2.0-exit-crash.patch:

--- NEW FILE vdr-sudoku-0.2.0-exit-crash.patch ---
Index: menu.cpp
===================================================================
--- menu.cpp	(revision 123)
+++ menu.cpp	(working copy)
@@ -132,7 +132,8 @@
         state = (this->*command)();
       if (state == osContinue)
         Show();
-      state = osContinue;
+      if (state == osUnknown)
+        state = osContinue;
     }
     return state;
   }


Index: vdr-sudoku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/vdr-sudoku.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdr-sudoku.spec	22 Mar 2008 12:26:51 -0000	1.7
+++ vdr-sudoku.spec	25 Mar 2008 16:30:01 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           vdr-%{pname}
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Sudoku plugin for VDR
 
 Group:          Amusements/Games
@@ -16,7 +16,7 @@
 Source1:        %{name}.conf
 Patch0:         %{name}-0.2.0-vardir.patch
 Patch1:         %{name}-0.2.0-no-pattern-default.patch
-Patch2:         %{name}-0.2.0-no-exit.patch
+Patch2:         %{name}-0.2.0-exit-crash.patch
 Patch3:         %{name}-0.2.0-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +33,7 @@
 %setup -q -n sudoku-%{version}
 sed -e 's|@PLUGINVARDIR@|%{vardir}/%{pname}|g' %{PATCH0} | patch -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch3 -p1
 for f in CONTRIBUTORS HISTORY README ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
@@ -80,6 +80,9 @@
 
 
 %changelog
+* Tue Mar 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.2.0-2
+- Apply upstream fix for OSD crash after exit.
+
 * Sat Mar 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.2.0-1
 - 0.2.0, license changed to GPLv2+.
 - Patch to add missing Finnish translations.


--- vdr-sudoku-0.2.0-no-exit.patch DELETED ---




More information about the fedora-extras-commits mailing list