Hello community, here is the log from the commit of package gnome-games for openSUSE:Factory checked in at Thu May 5 14:25:23 CEST 2011.
-------- --- GNOME/gnome-games/gnome-games.changes 2011-02-13 17:24:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-games/gnome-games.changes 2011-04-25 12:57:32.000000000 +0200 @@ -1,0 +2,78 @@ +Mon Apr 25 12:32:30 CEST 2011 - [email protected] + +- Drop python-gtk-devel BuildRequires: this shouldn't be needed + anymore. +- Manually remove icons that have a weird size. + +------------------------------------------------------------------- +Wed Apr 13 21:09:13 UTC 2011 - [email protected] + +- Add gnome-games-swell_and_lightsoff.patch: this re-enables + lightsoff and swell-foop, patches collected from git. +- Use gnome-sudoku Obsoletes if we can not build it. This ensures + that an update to gnome-games 3.0.0 is not blocked. +- Add gnome-common BuildRequires and add call to gnome-autogen.sh. + +------------------------------------------------------------------- +Tue Apr 5 14:11:14 UTC 2011 - [email protected] + +- Update to version 3.0.0: + + Use /org/gnome as starting path for schemas + + Aisleriot: + - add a primary-toolbar style class to the toolbar + - Use GNOME Design Team's new icon with 256x256 size + + Updated translations. +- Own some icons directories (new sizes). + +------------------------------------------------------------------- +Mon Mar 28 16:01:17 UTC 2011 - [email protected] + +- Update to version 2.91.93: + + 256x256 icons added for aisleriot and gnomine + + Aisleriot switched the default theme back to bonded and + temporarily removed the experimental clutter mode. + + Gnomine: new icons + + Quadrapassel: + - Don't show a preview when "Choose difficult blocks" is + switched on + - Only show the preview block in the correct circumstances + + Updated translations + +------------------------------------------------------------------- +Thu Mar 24 12:47:58 UTC 2011 - [email protected] + +- Update to version 2.91.91: + + Various bugfixes + + Updated translations. +- Changes from version 2.91.90: + + Chess was rewritten in vala. + + Iagno and gnomine had graphical glitches fixed. + + All games except swell-foop, lightsoff, and sudoku are now + working with GTK3. +- Changes from version 2.91.5: + + Mostly fixes for gtk3 and clutter-gtk 1.0. + + Quadrapassel also gained a new theme "Clean". +- Changes from version 2.91.3: + + Chess got a new option for showing the captured pieces. + + Quadrapassel and gnotravex got ported to gtk3. +- Changes from version 2.91.2: + + gnect, gnibbles, gnotski, gtali, and iagno were ported to gtk3. + + Fix lightsoff and swell-foop to work correctly again. +- Changes from version 2.91.1: + + aisleriot and glines were ported to gtk3. + + Aisleriot: + - Port window state persistence to gsettings + - Make kde card theme support work + + GLines: use a more sensible scoring system +- swell-foop, lightsoff and gnome-sudoku are not built for now. +- Drop gnome-games-CVE-2010-4003.patch: fixed upstream. +- Drop gnome-games-seed-fixes.patch: fixed upstream. +- Drop gnome-games-seed-gtk-gir-conflict.patch: no longer needed. +- Add pkgconfig(sqlite3) BuildRequires, needed for glchess. +- Remove gnome-python-desktop, python-gnome Requires, %py_requires + and python-gtkglext, python-opengl Recomends from glchess package + as it has been ported to vala. +- Replace GConf2 schemas handling with GSettings schemas handling, + with %glib2_gsettings_schema_* macros, for some games. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-games-2.32.1.tar.bz2 gnome-games-CVE-2010-4003.patch gnome-games-seed-fixes.patch gnome-games-seed-gtk-gir-conflict.patch New: ---- gnome-games-3.0.0.tar.bz2 gnome-games-swell_and_lightsoff.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-games.spec ++++++ --- /var/tmp/diff_new_pack.PQNdkH/_old 2011-05-05 14:21:42.000000000 +0200 +++ /var/tmp/diff_new_pack.PQNdkH/_new 2011-05-05 14:21:42.000000000 +0200 @@ -17,11 +17,11 @@ # norootforbuild +%define sudoku 0 Name: gnome-games -Version: 2.32.1 -Release: 5 -# FIXME: on update to GTK3 version, drop gnome-games-seed-gtk-gir-conflict.patch as it won't be needed anymore +Version: 3.0.0 +Release: 1 # FIXME: validate list of games for the recommended subpackage License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Games for GNOME @@ -31,18 +31,16 @@ Source1: %{name}-create-post Source2: README.openSUSE Source3: README-recommended.openSUSE -# PATCH-FIX-UPSTREAM gnome-games-CVE-2010-4003.patch bnc#642829 bgo#638729 CVE-2010-4003 [email protected] -- Does not safely set LD_LIBRARY_PATH -Patch0: gnome-games-CVE-2010-4003.patch -# PATCH-FIX-UPSTREAM gnome-games-seed-fixes.patch bnc#664917 [email protected] -- Fixes from git for the seed games so they actually work -Patch1: gnome-games-seed-fixes.patch -# PATCH-FIX-OPENSUSE gnome-games-seed-gtk-gir-conflict.patch [email protected] -- Make sure that GTK2 gir is used, to avoid conflict between the GTK2 and GTK3 -Patch2: gnome-games-seed-gtk-gir-conflict.patch +# PATCH-FIX-UPSTREAM gnome-games-swell_and_lightsoff.patch [email protected] -- Re-enable lightsoff and swell-foop. Patches collected from git. +Patch0: gnome-games-swell_and_lightsoff.patch BuildRequires: clutter-devel BuildRequires: clutter-gtk-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gconf2-devel BuildRequires: gnome-doc-utils-devel +# Required by patch0 +BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: guile-devel BuildRequires: intltool @@ -52,15 +50,20 @@ BuildRequires: lsb-release # Needed to get lsb data BuildRequires: dummy-release -BuildRequires: python-gtk-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(sqlite3) Requires: aisleriot Requires: glchess Requires: glines Requires: gnect Requires: gnibbles Requires: gnobots2 +%if %sudoku Requires: gnome-sudoku +%else +# We need to obsolete no longer existing games to ensure proper upgrade path. +Obsoletes: gnome-sudoku < %{version} +%endif Requires: gnomine Requires: gnotravex Requires: gnotski @@ -95,7 +98,12 @@ #Requires: gnect #Requires: gnibbles #Requires: gnobots2 +%if %sudoku Requires: gnome-sudoku +%else +# We need to obsolete no longer existing games to ensure proper upgrade path. +Obsoletes: gnome-sudoku < %{version} +%endif Requires: gnomine #Requires: gnotravex #Requires: gnotski @@ -124,6 +132,7 @@ PreReq: /bin/chown /bin/chmod /bin/rm /usr/bin/touch Recommends: %{name}-support-lang Suggests: gnome-games-extra-data +%glib2_gsettings_schema_requires %description support GNOME games is a collection of simple, but addictive, games from the @@ -156,13 +165,8 @@ Group: Amusements/Games/Board/Chess Requires: %{name}-support = %{version} Requires: chess_backend -Requires: gnome-python-desktop -Requires: python-gnome Recommends: glchess-lang -Recommends: python-gtkglext -Recommends: python-opengl -%gconf_schemas_prereq -%py_requires +%glib2_gsettings_schema_requires %description -n glchess This is a game for playing the classic board game of chess, in which @@ -237,6 +241,8 @@ This package is part of gnome-games. +%if %sudoku + %package -n gnome-sudoku License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ Summary: Sudoku Game for GNOME @@ -253,6 +259,7 @@ with the correct digits. This package is part of gnome-games. +%endif %package -n gnomine License: GPLv2+ ; GPLv3+ ; LGPLv2.1+ @@ -412,7 +419,9 @@ %lang_package -n gnect %lang_package -n gnibbles %lang_package -n gnobots2 +%if %sudoku %lang_package -n gnome-sudoku +%endif %lang_package -n gnomine %lang_package -n gnotravex %lang_package -n gnotski @@ -422,16 +431,16 @@ %lang_package -n mahjongg %lang_package -n quadrapassel %lang_package -n swell-foop + %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 cp -a %{S:1} . cp -a %{S:2} . cp -a %{S:3} . %build +gnome-autogen.sh %configure \ --disable-gnuchess \ --disable-schemas-install \ @@ -451,7 +460,9 @@ %suse_update_desktop_file gnect %suse_update_desktop_file gnibbles %suse_update_desktop_file gnobots2 +%if %sudoku %suse_update_desktop_file gnome-sudoku +%endif %suse_update_desktop_file gnomine %suse_update_desktop_file gnotravex %suse_update_desktop_file gnotski @@ -463,13 +474,20 @@ %suse_update_desktop_file -N "AisleRiot" -G "Solitaire" sol %suse_update_desktop_file swell-foop %find_lang %{name} %{?no_lang_C} -for subpackage in aisleriot glchess glines gnect gnibbles gnobots2 gnome-sudoku gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel swell-foop; do +%find_lang glchess %{?no_lang_C} +for subpackage in aisleriot glines gnect gnibbles gnobots2 \ +%if %sudoku +gnome-sudoku \ +%endif +gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel swell-foop ; do %find_lang ${subpackage} %{?no_lang_C} %def_gconf_schemas ${subpackage} %add_gconf_schemas ${subpackage} done %end_gconf_schemas bash gnome-games-create-post %{buildroot} +# Those icons have a non-standard size, we really don't want them. +rm %{buildroot}%{_datadir}/icons/hicolor/{26x26,34x34,40x40,50x50,64x50}/apps/gnome-aisleriot.png %fdupes %{buildroot} %clean @@ -487,6 +505,11 @@ rm -f var/games/same-gnome.Large.scores rm -f var/games/same-gnome.Medium.scores rm -f var/games/same-gnome.Small.scores +%glib2_gsettings_schema_post + +%postun support +%glib2_gsettings_schema_postun + ### aisleriot scriptlets ### %pre -n aisleriot -f aisleriot.schemas_pre @@ -504,19 +527,15 @@ %icon_theme_cache_postun ### glchess scriptlets ### -%pre -n glchess -f glchess.schemas_pre - %post -n glchess %desktop_database_post %icon_theme_cache_post - -%posttrans -n glchess -f glchess.schemas_posttrans - -%preun -n glchess -f glchess.schemas_preun +%glib2_gsettings_schema_post %postun -n glchess %desktop_database_postun %icon_theme_cache_postun +%glib2_gsettings_schema_postun ### glines scriptlets ### %pre -n glines -f glines.schemas_pre @@ -588,6 +607,8 @@ %icon_theme_cache_postun ### gnome-sudoku scriptlets ### +%if %sudoku + %pre -n gnome-sudoku -f gnome-sudoku.schemas_pre %post -n gnome-sudoku @@ -601,6 +622,7 @@ %postun -n gnome-sudoku %desktop_database_postun %icon_theme_cache_postun +%endif ### gnomine scriptlets ### %pre -n gnomine -f gnomine.schemas_pre @@ -771,6 +793,7 @@ %dir %{_libdir}/gnome-games %{_libdir}/gnome-games/libgames-support-gi.so* %{_datadir}/gir-1.0/GnomeGamesSupport-*.gir +%{_datadir}/glib-2.0/schemas/org.gnome.Games.WindowState.gschema.xml %dir %{_datadir}/gnome-games %{_datadir}/gnome-games/icons/ %{_datadir}/gnome-games/pixmaps/ @@ -799,7 +822,7 @@ %{_mandir}/man?/sol.* # If adding/removing a package, see the NOTE before aisleriot -%files -n glchess -f glchess.schemas_list +%files -n glchess %defattr(-, root, root) %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ @@ -810,8 +833,8 @@ %doc %{_datadir}/omf/glchess/glchess-C.omf %{_bindir}/glchess %{_datadir}/glchess/ -%{python_sitelib}/glchess/ %{_datadir}/applications/glchess.desktop +%{_datadir}/glib-2.0/schemas/org.gnome.glchess.gschema.xml %{_datadir}/icons/hicolor/*/apps/gnome-glchess.* %{_mandir}/man?/glchess.* # If adding/removing a package, see the NOTE before aisleriot @@ -924,6 +947,8 @@ %ghost %{_localstatedir}/games/gnobots2.robots_with_safe_teleport.scores # If adding/removing a package, see the NOTE before aisleriot +%if %sudoku + %files -n gnome-sudoku -f gnome-sudoku.schemas_list %defattr(-, root, root) %dir %{_datadir}/gnome/ @@ -940,6 +965,7 @@ %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.* %{_mandir}/man?/gnome-sudoku.* # If adding/removing a package, see the NOTE before aisleriot +%endif %files -n gnomine -f gnomine.schemas_list %defattr(-, root, root) @@ -952,7 +978,7 @@ %doc %{_datadir}/omf/gnomine/gnomine-C.omf %{_datadir}/applications/gnomine.desktop %{_datadir}/gnome-games/gnomine/ -%{_datadir}/icons/hicolor/*/apps/gnome-mines.* +%{_datadir}/icons/hicolor/*/apps/gnomine.png %{_mandir}/man?/gnomine.* %defattr (0755, games, games) # WARNING: If you are modifying this list, don't forget to edit the @@ -1186,7 +1212,10 @@ %files -n gnobots2-lang -f gnobots2.lang +%if %sudoku + %files -n gnome-sudoku-lang -f gnome-sudoku.lang +%endif %files -n gnomine-lang -f gnomine.lang ++++++ gnome-games-2.32.1.tar.bz2 -> gnome-games-3.0.0.tar.bz2 ++++++ GNOME/gnome-games/gnome-games-2.32.1.tar.bz2 /mounts/work_src_done/STABLE/gnome-games/gnome-games-3.0.0.tar.bz2 differ: char 11, line 1 ++++++ gnome-games-swell_and_lightsoff.patch ++++++ diff -ur gnome-games-3.0.0/configure.in gnome-games-3.0.0.patched/configure.in --- gnome-games-3.0.0/configure.in 2011-04-04 17:57:32.000000000 +0200 +++ gnome-games-3.0.0.patched/configure.in 2011-04-13 23:05:01.401445323 +0200 @@ -23,9 +23,9 @@ # we support and which features to check for # This is the canonical list of all game subdirectories. -allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno mahjongg quadrapassel" +allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel swell-foop" AC_SUBST([allgames]) -staginggames="swell-foop gnome-sudoku lightsoff" +staginggames="gnome-sudoku" AC_SUBST([staginggames]) gamelist="" diff -ur gnome-games-3.0.0/lightsoff/data/settings.ui gnome-games-3.0.0.patched/lightsoff/data/settings.ui --- gnome-games-3.0.0/lightsoff/data/settings.ui 2011-01-24 23:46:40.000000000 +0100 +++ gnome-games-3.0.0.patched/lightsoff/data/settings.ui 2011-04-13 23:06:42.383847536 +0200 @@ -7,7 +7,6 @@ <property name="border_width">5</property> <property name="icon_name">gnome-lightsoff</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> @@ -44,9 +43,10 @@ </packing> </child> <child> - <object class="GtkComboBox" id="theme-selector"> + <object class="GtkComboBoxText" id="theme-selector"> <property name="visible">True</property> - <property name="model">liststore1</property> + <property name="entry-text-column">0</property> + <property name="id-column">1</property> <signal name="changed" handler="select_theme"/> </object> <packing> @@ -132,10 +132,4 @@ <action-widget response="0">close-button</action-widget> </action-widgets> </object> - <object class="GtkListStore" id="liststore1"> - <columns> - <!-- column-name str --> - <column type="gchararray"/> - </columns> - </object> </interface> diff -ur gnome-games-3.0.0/lightsoff/src/main.js gnome-games-3.0.0.patched/lightsoff/src/main.js --- gnome-games-3.0.0/lightsoff/src/main.js 2011-01-24 23:46:59.000000000 +0100 +++ gnome-games-3.0.0.patched/lightsoff/src/main.js 2011-04-13 23:04:46.577270630 +0200 @@ -6,8 +6,6 @@ GtkBuilder = imports.gtkbuilder; GnomeGamesSupport = imports.gi.GnomeGamesSupport; -Gtk.init(Seed.argv); - try { GtkClutter.init(Seed.argv.length, Seed.argv); diff -ur gnome-games-3.0.0/lightsoff/src/Settings.js gnome-games-3.0.0.patched/lightsoff/src/Settings.js --- gnome-games-3.0.0/lightsoff/src/Settings.js 2011-01-24 23:46:40.000000000 +0100 +++ gnome-games-3.0.0.patched/lightsoff/src/Settings.js 2011-04-13 23:06:42.383847536 +0200 @@ -22,7 +22,7 @@ use_theme_colors = gconf_client.get_bool("/apps/lightsoff/use_theme_colors"); if(theme == null) - theme = default_theme_name; + theme_name = default_theme_name; } catch(e) { @@ -157,12 +157,6 @@ function populate_theme_selector(selector) { - // Since we're using GtkBuilder, we can't make a Gtk.ComboBox.text. Instead, - // we'll construct the cell renderer here, once, and use that. - var cell = new Gtk.CellRendererText(); - selector.pack_start(cell, true); - selector.add_attribute(cell, "text", 0); - var i = 0; for(var th in themes) diff -ur gnome-games-3.0.0/swell-foop/data/settings.ui gnome-games-3.0.0.patched/swell-foop/data/settings.ui --- gnome-games-3.0.0/swell-foop/data/settings.ui 2011-01-24 23:46:41.000000000 +0100 +++ gnome-games-3.0.0.patched/swell-foop/data/settings.ui 2011-04-13 23:06:55.747367052 +0200 @@ -7,7 +7,6 @@ <property name="title" translatable="yes">Swell Foop</property> <property name="icon_name">gnome-swell-foop</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> @@ -63,9 +62,10 @@ <property name="visible">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkComboBox" id="size-selector"> + <object class="GtkComboBoxText" id="size-selector"> <property name="visible">True</property> - <property name="model">liststore2</property> + <property name="entry-text-column">0</property> + <property name="id-column">1</property> <signal name="changed" handler="update_size"/> </object> <packing> @@ -136,9 +136,10 @@ </packing> </child> <child> - <object class="GtkComboBox" id="theme-selector"> + <object class="GtkComboBoxText" id="theme-selector"> <property name="visible">True</property> - <property name="model">liststore1</property> + <property name="entry-text-column">0</property> + <property name="id-column">1</property> <signal name="changed" handler="select_theme"/> </object> <packing> diff -ur gnome-games-3.0.0/swell-foop/src/Settings.js gnome-games-3.0.0.patched/swell-foop/src/Settings.js --- gnome-games-3.0.0/swell-foop/src/Settings.js 2011-01-24 23:46:41.000000000 +0100 +++ gnome-games-3.0.0.patched/swell-foop/src/Settings.js 2011-04-13 23:06:55.747367052 +0200 @@ -164,12 +164,6 @@ function populate_size_selector(selector) { - // Since we're using GtkBuilder, we can't make a Gtk.ComboBox.text. Instead, - // we'll construct the cell renderer here, once, and use that. - var cell = new Gtk.CellRendererText(); - selector.pack_start(cell, true); - selector.add_attribute(cell, "text", 0); - for(var i in sizes) { selector.append_text(sizes[i].name); @@ -178,12 +172,6 @@ function populate_theme_selector(selector) { - // Since we're using GtkBuilder, we can't make a Gtk.ComboBox.text. Instead, - // we'll construct the cell renderer here, once, and use that. - var cell = new Gtk.CellRendererText(); - selector.pack_start(cell, true); - selector.add_attribute(cell, "text", 0); - var i = 0; for(var th in themes) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
