rpms/vdr-sudoku/devel vdr-sudoku-0.2.0-finnish.patch, NONE, 1.1 vdr-sudoku-0.2.0-no-exit.patch, NONE, 1.1 vdr-sudoku-0.2.0-no-pattern-default.patch, NONE, 1.1 vdr-sudoku-0.2.0-vardir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vdr-sudoku.spec, 1.6, 1.7

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sat Mar 22 12:27:32 UTC 2008 

Author: scop

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

Modified Files:
	.cvsignore sources vdr-sudoku.spec 
Added Files:
	vdr-sudoku-0.2.0-finnish.patch vdr-sudoku-0.2.0-no-exit.patch 
	vdr-sudoku-0.2.0-no-pattern-default.patch 
	vdr-sudoku-0.2.0-vardir.patch 
Log Message:
* 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.
- Patch to move saved sudoku list to /var/lib/vdr/sudoku.
- Patch to not use the "show possible numbers as pattern" option by default;
  the feature is unexpected and doesn't work properly with all OSD's.
- Patch to remove the "Exit" choice from the plugin's commands menu; it
  causes a crash when opening the OSD next time after exiting the plugin.
- Prepare for VDR 1.6.0+ build.


vdr-sudoku-0.2.0-finnish.patch:

--- NEW FILE vdr-sudoku-0.2.0-finnish.patch ---
diff -up sudoku-0.2.0/po/fi_FI.po~ sudoku-0.2.0/po/fi_FI.po
--- sudoku-0.2.0/po/fi_FI.po~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/po/fi_FI.po	2008-03-22 13:39:48.000000000 +0200
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: vdr-sudoku 0.1.3\n"
 "Report-Msgid-Bugs-To: <tom at toms-cafe.de>\n"
 "POT-Creation-Date: 2008-03-21 13:07+0100\n"
-"PO-Revision-Date: 2007-08-20 22:43+0200\n"
+"PO-Revision-Date: 2008-03-22 13:39+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta at iki.fi>\n"
 "Language-Team:  <vdr at linuxtv.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,44 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 msgid "Generate a new puzzle"
-msgstr ""
+msgstr "Uusi ristikko"
 
 msgid "Load a puzzle"
-msgstr ""
+msgstr "Lataa ristikko"
 
 msgid "Save the puzzle"
-msgstr ""
+msgstr "Tallenna ristikko"
 
 msgid "Reset the puzzle"
-msgstr ""
+msgstr "Tyhjennä ristikko"
 
 msgid "Open setup menu"
-msgstr ""
+msgstr "Asetukset"
 
 msgid "Exit"
-msgstr ""
+msgstr "Poistu"
 
 msgid "Sudoku list"
-msgstr ""
+msgstr "Tallennetut ristikot"
 
 msgid "Button$Load"
-msgstr ""
+msgstr "Lataa"
 
 msgid "Button$Back"
-msgstr ""
+msgstr "Takaisin"
 
 msgid "Edit sudoku list"
-msgstr ""
+msgstr "Ristikon tiedot"
 
 msgid "Description"
-msgstr ""
+msgstr "Kuvaus"
 
 msgid ""
 "Congratulations!\n"
 "Press OK to start a new puzzle"
 msgstr ""
 "Onnittelut!\n"
-"Valitse 'OK' aloittaaksesi uuden tehtävän"
+"Valitse 'OK' aloittaaksesi uuden ristikon"
 
 msgid "Givens count"
 msgstr "Annettujen numeroiden lukumäärä"
@@ -70,10 +70,10 @@ msgid "Mark ambiguous numbers"
 msgstr "Merkitse epävarmat"
 
 msgid "Show possible numbers as pattern"
-msgstr ""
+msgstr "Näytä mahdolliset kuviona"
 
 msgid "Show possible numbers as digits"
-msgstr ""
+msgstr "Näytä mahdolliset numeroina"
 
 msgid "Clear marks on reset"
 msgstr "Poista merkinnät aloitettaessa"
diff -up sudoku-0.2.0/i18n.cpp~ sudoku-0.2.0/i18n.cpp
--- sudoku-0.2.0/i18n.cpp~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/i18n.cpp	2008-03-22 13:39:28.000000000 +0200
@@ -87,7 +87,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Uusi ristikko", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -109,7 +109,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Lataa ristikko", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -131,7 +131,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Tallenna ristikko", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -153,7 +153,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Tyhjennä ristikko", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -175,7 +175,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Asetukset", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -197,7 +197,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Poistu", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -219,7 +219,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Tallennetut ristikot", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -241,7 +241,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Lataa", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -263,7 +263,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Takaisin", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -285,7 +285,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Ristikon tiedot", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -307,7 +307,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Kuvaus", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -417,7 +417,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Näytä mahdolliset kuviona", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -439,7 +439,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "", // suomi / Finnish
+    "Näytä mahdolliset numeroina", // suomi / Finnish
     "", // Polski / Polish
     "", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek
@@ -505,7 +505,7 @@ const tI18nPhrase SudokuPlugin::Phrases[
     "", // Português / Portuguese
     "", // Français / French
     "", // Norsk / Norwegian
-    "Onnittelut!\nValitse 'OK' aloittaaksesi uuden tehtävän", // suomi / Finnish
+    "Onnittelut!\nValitse 'OK' aloittaaksesi uuden ristikon", // suomi / Finnish
     "", // Polski / Polish
     "¡Enhorabuena!\nPulse OK para iniciar un nuevo rompecabezas", // Español / Spanish
     "", // ÅëëçíéêÜ / Greek

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

--- NEW FILE vdr-sudoku-0.2.0-no-exit.patch ---
Remove "Exit" from commands menu, it causes crashes when opening the
OSD next time after exiting the plugin.

diff -up sudoku-0.2.0/commands.cpp~ sudoku-0.2.0/commands.cpp
--- sudoku-0.2.0/commands.cpp~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/commands.cpp	2008-03-22 14:11:15.000000000 +0200
@@ -43,7 +43,6 @@ CommandMenu::CommandMenu() :
   Add(new Command(hk(tr("Save the puzzle")),       &Menu::save));
   Add(new Command(hk(tr("Reset the puzzle")),      &Menu::reset));
   Add(new Command(hk(tr("Open setup menu")),       &Menu::open_setup));
-  Add(new Command(hk(tr("Exit")),                  &Menu::exit));
   command = NULL;
 }
 

vdr-sudoku-0.2.0-no-pattern-default.patch:

--- NEW FILE vdr-sudoku-0.2.0-no-pattern-default.patch ---
Don't show possible numbers as a pattern by default, it's an unexpected
feature and doesn't work properly with all OSD's.

diff -up sudoku-0.2.0/setup.cpp~ sudoku-0.2.0/setup.cpp
--- sudoku-0.2.0/setup.cpp~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/setup.cpp	2008-03-22 13:43:53.000000000 +0200
@@ -39,7 +39,7 @@ SetupData::SetupData()
   symmetric = 1;
   mark_errors = 1;
   mark_ambiguous = 1;
-  show_possibles_pattern = 1;
+  show_possibles_pattern = 0;
   show_possibles_digits = 1;
   clear_marks = 0;
   transparency = 50;

vdr-sudoku-0.2.0-vardir.patch:

--- NEW FILE vdr-sudoku-0.2.0-vardir.patch ---
diff -up sudoku-0.2.0/menu.cpp~ sudoku-0.2.0/menu.cpp
--- sudoku-0.2.0/menu.cpp~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/menu.cpp	2008-03-22 13:55:17.000000000 +0200
@@ -85,7 +85,7 @@ Menu::Menu(cPlugin* plugin, const SetupD
   command_menu = NULL;
   list_menu = NULL;
   setup_menu = NULL;
-  listfile = AddDirectory(plugin->ConfigDirectory(plugin->Name()), SUDOKU_LIST);
+  listfile = AddDirectory("@PLUGINVARDIR@", SUDOKU_LIST);
 }
 
 /** Destructor */
diff -up sudoku-0.2.0/README~ sudoku-0.2.0/README
--- sudoku-0.2.0/README~	2008-03-22 04:00:00.000000000 +0200
+++ sudoku-0.2.0/README	2008-03-22 13:55:57.000000000 +0200
@@ -57,9 +57,7 @@ new puzzle is only generated on VDR star
 selecting this command in the commands menu, which is opened with the blue key.
 
 In the commands menu you can load and save puzzles from/to the sudoku-list file.
-This file is located at the plugins folder inside the configuration folder of
-VDR. If you don't specify a configuration folder, your videodir is used (e.g.
-/video0/plugins/sudoku/sudoku-list).
+This file is located in @PLUGINVARDIR at .
 
 The sudoku-list file contains lines with a sudoku dump and an optional
 description. The sudoku dump has to begin at the first position of the line.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Feb 2007 06:43:38 -0000	1.3
+++ .cvsignore	22 Mar 2008 12:26:51 -0000	1.4
@@ -1 +1 @@
-vdr-sudoku-0.1.3.tgz
+vdr-sudoku-0.2.0.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Feb 2007 06:43:38 -0000	1.3
+++ sources	22 Mar 2008 12:26:51 -0000	1.4
@@ -1 +1 @@
-aa6dbde591e5f9cdd079f4112880acd6  vdr-sudoku-0.1.3.tgz
+24e590107a2eb2055e25c57c5832cb1a  vdr-sudoku-0.2.0.tgz


Index: vdr-sudoku.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr-sudoku/devel/vdr-sudoku.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vdr-sudoku.spec	16 Feb 2008 11:00:00 -0000	1.6
+++ vdr-sudoku.spec	22 Mar 2008 12:26:51 -0000	1.7
@@ -1,20 +1,27 @@
 %define pname     sudoku
+%define vardir    %(vdr-config --vardir     2>/dev/null || echo ERROR)
 %define plugindir %(vdr-config --plugindir  2>/dev/null || echo ERROR)
+%define vdr_user  %(vdr-config --user       2>/dev/null || echo ERROR)
 %define apiver    %(vdr-config --apiversion 2>/dev/null || echo ERROR)
 
 Name:           vdr-%{pname}
-Version:        0.1.3
-Release:        3%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        Sudoku plugin for VDR
 
 Group:          Amusements/Games
-License:        GPL+
+License:        GPLv2+
 URL:            http://www.toms-cafe.de/vdr/sudoku/
 Source0:        http://toms-cafe.de/vdr/sudoku/%{name}-%{version}.tgz
 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
+Patch3:         %{name}-0.2.0-finnish.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  vdr-devel >= 1.3.47
+BuildRequires:  gettext
 Requires:       vdr(abi) = %{apiver}
 
 %description
@@ -24,35 +31,65 @@
 
 %prep
 %setup -q -n sudoku-%{version}
-for f in HISTORY README ; do
+sed -e 's|@PLUGINVARDIR@|%{vardir}/%{pname}|g' %{PATCH0} | patch -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+for f in CONTRIBUTORS HISTORY README ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 
 
 %build
-make %{?_smp_mflags} LIBDIR=. VDRDIR=%{_libdir}/vdr all
+make %{?_smp_mflags} LIBDIR=. LOCALEDIR=./locale VDRDIR=%{_libdir}/vdr all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{plugindir}
 install -pm 755 libvdr-%{pname}.so.%{apiver} $RPM_BUILD_ROOT%{plugindir}
+
+if pkg-config --atleast-version 1.5.0 vdr ; then
+    install -dm 755 $RPM_BUILD_ROOT%{_datadir}/locale
+    cp -pR locale/* $RPM_BUILD_ROOT%{_datadir}/locale
+    %find_lang %{name}
+else
+    cat /dev/null > %{name}.lang
+fi
+
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
+install -dm 755 $RPM_BUILD_ROOT%{vardir}/%{pname}
+cat /dev/null >$RPM_BUILD_ROOT%{vardir}/%{pname}/sudoku-list
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING HISTORY README
+%doc CONTRIBUTORS COPYING HISTORY README
 %config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 %{plugindir}/libvdr-%{pname}.so.%{apiver}
+%defattr(-,%{vdr_user},root,-)
+%dir %{vardir}/%{pname}/
+%ghost %config(noreplace) %{vardir}/%{pname}/sudoku-list
 
 
 %changelog
+* 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.
+- Patch to move saved sudoku list to /var/lib/vdr/sudoku.
+- Patch to not use the "show possible numbers as pattern" option by default;
+  the feature is unexpected and doesn't work properly with all OSD's.
+- Patch to remove the "Exit" choice from the plugin's commands menu; it
+  causes a crash when opening the OSD next time after exiting the plugin.
+- Prepare for VDR 1.6.0+ build.
+
 * Sat Feb 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.1.3-3
 - Rebuild.

More information about the fedora-extras-commits mailing list