Author: megabajt Date: Wed Mar 28 19:33:47 2012 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.4.0; merged changes from DEVEL
---- Files affected: packages/gnome-games: gnome-games.spec (1.246 -> 1.247) ---- Diffs: ================================================================ Index: packages/gnome-games/gnome-games.spec diff -u packages/gnome-games/gnome-games.spec:1.246 packages/gnome-games/gnome-games.spec:1.247 --- packages/gnome-games/gnome-games.spec:1.246 Tue Mar 27 07:08:28 2012 +++ packages/gnome-games/gnome-games.spec Wed Mar 28 21:33:42 2012 @@ -7,19 +7,18 @@ Summary(uk.UTF-8): Ігри під GNOME Summary(wa.UTF-8): Djeus po GNOME Name: gnome-games -Version: 3.2.1 -Release: 2 +Version: 3.4.0 +Release: 1 Epoch: 1 License: LGPL Group: X11/Applications/Games -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-games/3.2/%{name}-%{version}.tar.xz -# Source0-md5: ea918bdb469f7bf550750862bbda2b12 -Patch0: %{name}-schemas.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-games/3.4/%{name}-%{version}.tar.xz +# Source0-md5: 681cbdfa1123dca0819683f994820e12 URL: http://live.gnome.org/GnomeGames -BuildRequires: GConf2-devel >= 2.28.0 BuildRequires: OpenGL-GLU-devel BuildRequires: autoconf >= 2.53 BuildRequires: automake >= 1:1.11 +BuildRequires: cairo-devel >= 1.10.0 BuildRequires: clutter-devel >= 1.0.0 BuildRequires: clutter-gtk-devel >= 1.0.0 BuildRequires: docbook-dtd412-xml @@ -29,7 +28,7 @@ BuildRequires: gnome-common >= 2.24.0 BuildRequires: gnome-doc-utils >= 0.14.0 BuildRequires: gobject-introspection-devel >= 0.10.0 -BuildRequires: gtk+3-devel >= 3.0.0 +BuildRequires: gtk+3-devel >= 3.4.0 BuildRequires: intltool >= 0.40.4 BuildRequires: libcanberra-gtk3-devel >= 0.26 BuildRequires: librsvg-devel >= 1:2.32.0 @@ -44,10 +43,11 @@ BuildRequires: scrollkeeper >= 0.3.8 BuildRequires: sqlite3-devel BuildRequires: tar >= 1:1.22 -BuildRequires: vala >= 2:0.14.0 +BuildRequires: vala >= 2:0.15.1 BuildRequires: xorg-lib-libSM-devel BuildRequires: xorg-proto-glproto-devel BuildRequires: xz +BuildRequires: yelp-tools Requires(post,postun): gtk-update-icon-cache Requires(post,postun): glib2 >= 1:2.26.0 Requires: hicolor-icon-theme @@ -95,15 +95,11 @@ Group: X11/Applications/Games Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme -Requires: python-gnome-gconf Suggests: crafty Suggests: gnuchess -Suggests: python-PyOpenGL -Suggests: python-pygtkglext >= 1.1.0-2 Obsoletes: glchess %description glchess @@ -123,7 +119,6 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -140,8 +135,7 @@ Summary(pl.UTF-8): Gra "Cztery w rzędzie" Group: X11/Applications/Games Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -157,8 +151,7 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -174,8 +167,7 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -191,7 +183,6 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -208,7 +199,6 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -225,8 +215,7 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -244,8 +233,7 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -260,7 +248,6 @@ Summary(pl.UTF-8): Iagno dla GNOME Group: X11/Applications/Games Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -276,16 +263,9 @@ Summary(pl.UTF-8): Gra Lights Off dla GNOME Group: X11/Applications/Games Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: GConf2-libs -Requires: clutter >= 1.0.0 -Requires: clutter-gtk >= 1.0.0 -Requires: gobject-introspection >= 0.10.0 -Requires: gtk+3 Requires: hicolor-icon-theme -Requires: seed %description lightsoff Lights Off is a puzzle game, where the objective is to turn off all of @@ -303,7 +283,6 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme @@ -321,8 +300,7 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} Requires: hicolor-icon-theme Provides: gnome-games-gnometris @@ -339,9 +317,8 @@ Summary(pl.UTF-8): Prosty interfejs do grania, zapisywania, drukowania i rozwiązywania Sudoku Group: X11/Applications/Games Requires(post,postun): gtk-update-icon-cache -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: GConf2-libs Requires: gobject-introspection >= 0.10.0 Requires: gtk+3 Requires: hicolor-icon-theme @@ -363,14 +340,9 @@ Group: X11/Applications/Games Requires(post): coreutils Requires(post,postun): gtk-update-icon-cache -Requires(post,postun): scrollkeeper -Requires(post,preun): GConf2 +Requires(post,postun): glib2 >= 1:2.26.0 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: clutter >= 1.0.0 -Requires: gobject-introspection >= 0.10.0 -Requires: gtk+3 Requires: hicolor-icon-theme -Requires: seed Provides: gnome-games-same-gnome Obsoletes: gnome-games-same-gnome @@ -382,7 +354,6 @@ %prep %setup -q -%patch0 -p1 %build %{__glib_gettextize} @@ -395,8 +366,6 @@ %configure \ --enable-games=all \ --enable-staging \ - --disable-scrollkeeper \ - --disable-schemas-install \ --disable-silent-rules \ --disable-static @@ -408,48 +377,49 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la + %py_postclean -%find_lang %{name} --all-name -%find_lang gnect --with-gnome --with-omf -%find_lang gnomine --with-gnome --with-omf -%find_lang swell-foop --with-gnome --with-omf -%find_lang mahjongg --with-gnome --with-omf -%find_lang glchess --with-gnome --with-omf -%find_lang gtali --with-gnome --with-omf -%find_lang gnome-sudoku --with-gnome --with-omf -%find_lang gnotravex --with-gnome --with-omf -%find_lang gnotski --with-gnome --with-omf -%find_lang glines --with-gnome --with-omf -%find_lang iagno --with-gnome --with-omf -%find_lang gnobots2 --with-gnome --with-omf -%find_lang gnibbles --with-gnome --with-omf -%find_lang quadrapassel --with-gnome --with-omf -%find_lang lightsoff --with-gnome --with-omf +%find_lang %{name} +%find_lang gnect --with-gnome +%find_lang gnomine --with-gnome +%find_lang swell-foop --with-gnome +%find_lang mahjongg --with-gnome +%find_lang glchess --with-gnome +%find_lang gtali --with-gnome +%find_lang gnome-sudoku --with-gnome +%find_lang gnotravex --with-gnome +%find_lang gnotski --with-gnome +%find_lang glines --with-gnome +%find_lang iagno --with-gnome +%find_lang gnobots2 --with-gnome +%find_lang gnibbles --with-gnome +%find_lang quadrapassel --with-gnome +%find_lang lightsoff --with-gnome %clean rm -rf $RPM_BUILD_ROOT %post %glib_compile_schemas +%update_icon_cache hicolor %postun %glib_compile_schemas +%update_icon_cache hicolor %post glchess %update_icon_cache hicolor %update_desktop_database_post -%scrollkeeper_update_post %glib_compile_schemas %postun glchess %update_icon_cache hicolor %update_desktop_database_postun -%scrollkeeper_update_postun %glib_compile_schemas %post glines -%scrollkeeper_update_post %update_icon_cache hicolor %glib_compile_schemas @@ -460,26 +430,20 @@ fi %postun glines -%scrollkeeper_update_postun %update_icon_cache hicolor %glib_compile_schemas %post gnect -%scrollkeeper_update_post -%gconf_schema_install gnect.schemas %update_icon_cache hicolor - -%preun gnect -%gconf_schema_uninstall gnect.schemas +%glib_compile_schemas %postun gnect -%scrollkeeper_update_postun %update_icon_cache hicolor +%glib_compile_schemas %post gnibbles -%scrollkeeper_update_post -%gconf_schema_install gnibbles.schemas %update_icon_cache hicolor +%glib_compile_schemas for i in gnibbles.1.0 gnibbles.1.1 gnibbles.2.0 gnibbles.2.1 gnibbles.3.0 \ gnibbles.3.1 gnibbles.4.0 gnibbles.4.1; do @@ -490,16 +454,12 @@ fi done -%preun gnibbles -%gconf_schema_uninstall gnibbles.schemas - %postun gnibbles -%scrollkeeper_update_postun %update_icon_cache hicolor +%glib_compile_schemas %post gnobots2 -%scrollkeeper_update_post -%gconf_schema_install gnobots2.schemas +%glib_compile_schemas %update_icon_cache hicolor for i in gnobots2.classic_robots-safe gnobots2.classic_robots \ @@ -518,15 +478,11 @@ fi done -%preun gnobots2 -%gconf_schema_uninstall gnobots2.schemas - %postun gnobots2 -%scrollkeeper_update_postun +%glib_compile_schemas %update_icon_cache hicolor %post gnomine -%scrollkeeper_update_post %glib_compile_schemas %update_icon_cache hicolor @@ -539,12 +495,10 @@ done %postun gnomine -%scrollkeeper_update_postun %update_icon_cache hicolor %glib_compile_schemas %post gnotravex -%scrollkeeper_update_post %glib_compile_schemas %update_icon_cache hicolor @@ -558,13 +512,11 @@ done %postun gnotravex -%scrollkeeper_update_postun %update_icon_cache hicolor %glib_compile_schemas %post gnotski -%scrollkeeper_update_post -%gconf_schema_install gnotski.schemas +%glib_compile_schemas %update_icon_cache hicolor for i in 1 2 3 4 5 6 7 11 12 13 14 15 16 17 21 22 23 24 25 26; do @@ -575,16 +527,12 @@ fi done -%preun gnotski -%gconf_schema_uninstall gnotski.schemas - %postun gnotski -%scrollkeeper_update_postun +%glib_compile_schemas %update_icon_cache hicolor %post gtali -%scrollkeeper_update_post -%gconf_schema_install gtali.schemas +%glib_compile_schemas %update_icon_cache hicolor if [ ! -f %{_gamesdir}/gtali.scores ]; then @@ -593,37 +541,27 @@ chmod 664 %{_gamesdir}/gtali.scores fi -%preun gtali -%gconf_schema_uninstall gtali.schemas - %postun gtali -%scrollkeeper_update_postun +%glib_compile_schemas %update_icon_cache hicolor %post iagno -%scrollkeeper_update_post %glib_compile_schemas %update_icon_cache hicolor %postun iagno -%scrollkeeper_update_postun %update_icon_cache hicolor %glib_compile_schemas %post lightsoff -%scrollkeeper_update_post -%gconf_schema_install lightsoff.schemas %update_icon_cache hicolor - -%preun lightsoff -%gconf_schema_uninstall lightsoff.schemas +%glib_compile_schemas %postun lightsoff -%scrollkeeper_update_postun %update_icon_cache hicolor +%glib_compile_schemas %post mahjongg -%scrollkeeper_update_post %glib_compile_schemas %update_icon_cache hicolor @@ -638,14 +576,12 @@ done %postun mahjongg -%scrollkeeper_update_postun %update_icon_cache hicolor %glib_compile_schemas %post quadrapassel -%scrollkeeper_update_post -%gconf_schema_install quadrapassel.schemas %update_icon_cache hicolor +%glib_compile_schemas if [ ! -f %{_gamesdir}/quadrapassel.scores ]; then touch %{_gamesdir}/quadrapassel.scores @@ -653,34 +589,33 @@ chmod 664 %{_gamesdir}/quadrapassel.scores fi -%preun quadrapassel -%gconf_schema_uninstall quadrapassel.schemas - %postun quadrapassel -%scrollkeeper_update_postun %update_icon_cache hicolor +%glib_compile_schemas %post sudoku %update_icon_cache hicolor -%gconf_schema_install gnome-sudoku.schemas - -%preun sudoku -%gconf_schema_uninstall gnome-sudoku.schemas +%glib_compile_schemas %postun sudoku %update_icon_cache hicolor +%glib_compile_schemas %post swell-foop -%scrollkeeper_update_post -%gconf_schema_install swell-foop.schemas %update_icon_cache hicolor +%glib_compile_schemas -%preun swell-foop -%gconf_schema_uninstall swell-foop.schemas +for i in large normal small; do + if [ ! -f %{_gamesdir}/swell-foop.$i.scores ]; then + touch %{_gamesdir}/swell-foop.$i.scores + chown root:games %{_gamesdir}/swell-foop.$i.scores + chmod 664 %{_gamesdir}/swell-foop.$i.scores + fi +done %postun swell-foop -%scrollkeeper_update_postun %update_icon_cache hicolor +%glib_compile_schemas %files -f %{name}.lang %defattr(644,root,root,755) @@ -689,68 +624,65 @@ %attr(755,root,root) %{_libdir}/%{name}/libgames-support-gi.so* %{_libdir}/%{name}/GnomeGamesSupport-1.0.* %{_datadir}/glib-2.0/schemas/org.gnome.Games.WindowState.gschema.xml +%{_iconsdir}/hicolor/*/*/*.png %dir %{_datadir}/%{name} -%{_datadir}/%{name}/icons -%{_datadir}/%{name}/sounds -%{_datadir}/%{name}/pixmaps %files glchess -f glchess.lang %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/glchess -%attr(755,root,root) %{_bindir}/gnome-gnuchess %{_desktopdir}/glchess.desktop %{_datadir}/glchess %{_datadir}/glib-2.0/schemas/org.gnome.glchess.gschema.xml -%{_iconsdir}/hicolor/*/*/gnome-glchess.* +%{_iconsdir}/hicolor/*/*/glchess.* %{_mandir}/man6/glchess.6* %files glines -f glines.lang %defattr(644,root,root,755) %attr(2755,root,games) %{_bindir}/glines -%{_datadir}/%{name}/glines +%{_datadir}/glines %{_datadir}/glib-2.0/schemas/org.gnome.glines.gschema.xml %{_desktopdir}/glines.desktop -%{_iconsdir}/hicolor/*/*/gnome-glines.* -%attr(664,root,games) %ghost %{_localstatedir}/games/glines.* +%{_iconsdir}/hicolor/*/*/glines.* +%attr(664,root,games) %ghost %{_gamesdir}/glines.* %{_mandir}/man6/glines.6* %files gnect -f gnect.lang %defattr(644,root,root,755) %attr(755,root,games) %{_bindir}/gnect -%{_sysconfdir}/gconf/schemas/gnect.schemas -%{_datadir}/%{name}/gnect +%{_datadir}/gnect +%{_datadir}/glib-2.0/schemas/org.gnome.gnect.gschema.xml %{_desktopdir}/gnect.desktop -%{_iconsdir}/hicolor/*/*/gnome-gnect.* +%{_iconsdir}/hicolor/*/*/gnect.* %{_mandir}/man6/gnect.6* %files gnibbles -f gnibbles.lang %defattr(644,root,root,755) %attr(2755,root,games) %{_bindir}/gnibbles -%{_sysconfdir}/gconf/schemas/gnibbles.schemas -%{_datadir}/%{name}/gnibbles +%{_datadir}/gnibbles +%{_datadir}/glib-2.0/schemas/org.gnome.gnibbles.gschema.xml %{_desktopdir}/gnibbles.desktop -%{_iconsdir}/hicolor/*/*/gnome-gnibbles.* -%attr(664,root,games) %ghost %{_localstatedir}/games/gnibbles.* +%{_iconsdir}/hicolor/*/*/gnibbles.* +%attr(664,root,games) %ghost %{_gamesdir}/gnibbles.* %{_mandir}/man6/gnibbles.6* %files gnobots2 -f gnobots2.lang %defattr(644,root,root,755) %attr(2755,root,games) %{_bindir}/gnobots2 -%{_sysconfdir}/gconf/schemas/gnobots2.schemas -%{_datadir}/%{name}/gnobots2 +%{_datadir}/gnobots2 +%{_datadir}/glib-2.0/schemas/org.gnome.gnobots2.gschema.xml %{_desktopdir}/gnobots2.desktop -%{_iconsdir}/hicolor/*/*/gnome-robots.* -%attr(664,root,games) %ghost %{_localstatedir}/games/gnobots2.* +%{_iconsdir}/hicolor/*/*/gnobots2.* +%attr(664,root,games) %ghost %{_gamesdir}/gnobots2.* %{_mandir}/man6/gnobots2.6* %files gnomine -f gnomine.lang %defattr(644,root,root,755) %attr(2755,root,games) %{_bindir}/gnomine -%{_datadir}/%{name}/gnomine +%{_datadir}/gnomine %{_datadir}/glib-2.0/schemas/org.gnome.gnomine.gschema.xml %{_desktopdir}/gnomine.desktop <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/packages/gnome-games/gnome-games.spec?r1=1.246&r2=1.247 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
