update clutter and fix gnome-games

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1044 ec354946-7b23-47d6-9f5a-488ba84defc7

c/clutter-gtk/clutter-gtk-vl.spec

@@ -2,7 +2,7 @@
 %define         clutter_gtk_release 1%{?_dist_release}
 
 Name:           clutter-gtk
-Version:        %{clutter_gtk_version}.2
+Version:        %{clutter_gtk_version}.4
 Release:        %{clutter_gtk_release}
 Summary:        A basic GTK clutter widget
 
@@ -12,7 +12,9 @@ URL:            http://www.clutter-project.org
 Source0:        http://www.clutter-project.org/sources/%{name}/%{clutter_gtk_version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:  gtk2-devel clutter-devel       
+BuildRequires:  gtk2-devel
+BuildRequires:	clutter-devel
+BuildRequires:	gir-repository-devel
 
 %description
 This allows clutter to be embedded in GTK applications. 
@@ -67,9 +69,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/clutter-1.0/clutter-gtk
 
 %changelog
-* Tue Dec 01 2009 Takemikaduchi <bsyamato@sea.plala.or.jp> 0.10.2-1
+* Thu May 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.4-1
+- new upstream release
+- add BuildRequires: gir-repository-devel
+
+* Tue Dec 01 2009 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.10.2-1
 - build for Vine Linux
 
+
 * Wed Jul 29 2009 Bastien Nocera <bnocera@redhat.com> 0.10.2-1
 - Update to 0.10.2
 

c/clutter/clutter-vl.spec

@@ -1,4 +1,4 @@
-%define         clutter_version 1.2.6
+%define         clutter_version 1.2.8
 %define         clutter_release 1%{?_dist_release}
 
 Name:           clutter
@@ -10,7 +10,7 @@ Summary(ja):    リッチなGUIを作成するためのオープンソースラ
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.clutter-project.org/
-Source0:        http://www.clutter-project.org/sources/%{name}/1.0/%{name}-%{version}.tar.bz2
+Source0:        http://www.clutter-project.org/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 Requires:       gobject-introspection
@@ -73,7 +73,7 @@ This package contains documentation for clutter.
 %setup -q
 
 %build
-%configure --enable-gtk-doc --enable-introspection
+%configure --enable-gtk-doc --enable-introspection --enable-xinput
 make %{?_smp_mflags}
 
 %install
@@ -112,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.8-1
+- new upstream release
+- add configure option (--enable-xinput)
+
 * Thu Apr 29 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.6-1
 - new upstream release
 

g/gnome-games/gnome-games-vl.spec

@@ -15,11 +15,13 @@ Summary(ja): GNOME ゲーム集
 Name: gnome-games
 %define major 2.30
 Version: %{major}.1
-Release: 1%{_dist_release}
+Release: 2%{_dist_release}
 License: GPLv2+ and GFDL+
 Group: Applications/Games
 Source:	ftp://ftp.gnome.org/pub/gnome/sources/%{name}/%{major}/%{name}-%{version}.tar.bz2
 Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
+## patch from FC-package
+Patch2: gnome-games-libs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Obsoletes: gnome gnome-games-devel
@@ -36,6 +38,7 @@ Requires: gnome-python-gnomeprint
 Requires: pygtkglext PyOpenGL
 Requires: gnuchess
 Requires: hicolor-icon-theme
+Requires: seed
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -54,6 +57,8 @@ BuildRequires: clutter-devel, clutter-gtk-devel
 BuildRequires: libSM-devel
 BuildRequires: check-devel
 BuildRequires: libcanberra-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: gir-repository-devel
 BuildRequires: docbook-dtds
 
 # Newer than internal gettext needed
@@ -88,6 +93,7 @@ gnome-games パッケージにはいくつかの小さなゲームが入って
 %setup -q
 # rebrand gnometris as some think the name is to similar to a trademark
 ## %patch1 -p1 -b .rebrand
+%patch2 -p1 -b .libs
 
 ## sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
 ##   -e 's/GNOMEtris/GnomeFallingBlocks/g' \
@@ -98,9 +104,22 @@ gnome-games パッケージにはいくつかの小さなゲームが入って
 
 autoconf
 export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL"
-%configure --with-sound=gstreamer --localstatedir=/var/lib --disable-gnuchess --disable-introspection
+%configure --with-sound=gstreamer --localstatedir=/var/lib --disable-gnuchess
 make 
 
+# strip unneeded translations from .mo files
+# ideally intltool (ha!) would do that for us
+# http://bugzilla.gnome.org/show_bug.cgi?id=474987
+cd po
+grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep
+mv POTFILES.keep POTFILES.in
+intltool-update --pot
+for p in *.po; do
+  msgmerge $p %{gettext_package}.pot > $p.out
+  msgfmt -o `basename $p .po`.gmo $p.out
+done
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -151,21 +170,24 @@ rm -rf $RPM_BUILD_ROOT
 scrollkeeper-update -q
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-(cd %{_sysconfdir}/gconf/schemas;   \
-gconftool-2 --makefile-install-rule \
-	aisleriot.schemas           \
-	gtali.schemas               \
-	glchess.schemas             \
-	glines.schemas              \
-	gnect.schemas               \
-	gnibbles.schemas            \
-	gnobots2.schemas            \
-	quadrapassel.schemas        \
-	gnomine.schemas             \
-	gnotravex.schemas           \
-	gnotski.schemas             \
-	iagno.schemas               \
-	mahjongg.schemas            \
+(cd %{_sysconfdir}/gconf/schemas;	\
+gconftool-2 --makefile-install-rule	\
+	aisleriot.schemas		\
+	glchess.schemas			\
+	glines.schemas			\
+	gnect.schemas			\
+	gnibbles.schemas		\
+	gnobots2.schemas		\
+	gnome-sudoku.schemas		\
+	gnomine.schemas			\
+	gnotravex.schemas		\
+	gnotski.schemas			\
+	gtali.schemas			\
+	iagno.schemas			\
+	lightsoff.schemas		\
+	mahjongg.schemas		\
+	quadrapassel.schemas		\
+	swell-foop.schemas		\
 > /dev/null || : )
 
 touch %{_datadir}/icons/hicolor
@@ -182,19 +204,22 @@ if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
-	aisleriot.schemas           \
-	gtali.schemas               \
-	glchess.schemas             \
-	glines.schemas              \
-	gnect.schemas               \
-	gnibbles.schemas            \
-	gnobots2.schemas            \
-	quadrapassel.schemas        \
-	gnomine.schemas             \
-	gnotravex.schemas           \
-	gnotski.schemas             \
-	iagno.schemas               \
-	mahjongg.schemas            \
+	aisleriot.schemas		\
+	glchess.schemas			\
+	glines.schemas			\
+	gnect.schemas			\
+	gnibbles.schemas		\
+	gnobots2.schemas		\
+	gnome-sudoku.schemas		\
+	gnomine.schemas			\
+	gnotravex.schemas		\
+	gnotski.schemas			\
+	gtali.schemas			\
+	iagno.schemas			\
+	lightsoff.schemas		\
+	mahjongg.schemas		\
+	quadrapassel.schemas		\
+	swell-foop.schemas		\
 > /dev/null || : )
 fi
 
@@ -203,19 +228,22 @@ if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
-	aisleriot.schemas           \
-	gtali.schemas               \
-	glchess.schemas             \
-	glines.schemas              \
-	gnect.schemas               \
-	gnibbles.schemas            \
-	gnobots2.schemas            \
-	quadrapassel.schemas        \
-	gnomine.schemas             \
-	gnotravex.schemas           \
-	gnotski.schemas             \
-	iagno.schemas               \
-	mahjongg.schemas            \
+	aisleriot.schemas		\
+	glchess.schemas			\
+	glines.schemas			\
+	gnect.schemas			\
+	gnibbles.schemas		\
+	gnobots2.schemas		\
+	gnome-sudoku.schemas		\
+	gnomine.schemas			\
+	gnotravex.schemas		\
+	gnotski.schemas			\
+	gtali.schemas			\
+	iagno.schemas			\
+	lightsoff.schemas		\
+	mahjongg.schemas		\
+	quadrapassel.schemas		\
+	swell-foop.schemas		\
 > /dev/null || : )
 
   ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
@@ -246,6 +274,8 @@ fi
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
 %{_libdir}/gnome-games
+%{_libdir}/girepository-1.0/GnomeGamesSupport-1.0.typelib
+%{_datadir}/gir-1.0/GnomeGamesSupport-1.0.gir
 
 %{python_sitelib}/glchess
 %{python_sitelib}/gnome_sudoku
@@ -256,27 +286,33 @@ fi
 ## %{_bindir}blackjack
 %{_bindir}/glchess
 %{_bindir}/gnome-sudoku
+%{_bindir}/lightsoff
+%{_bindir}/swell-foop
 
 ## %{_datadir}/ggz
 
 # these are setgid games
 %attr(2551, root, games) %{_bindir}/gnomine
-## %attr(2551, root, games) %{_bindir}/same-gnome
 %attr(2551, root, games) %{_bindir}/mahjongg
 %attr(2551, root, games) %{_bindir}/gtali
 %attr(2551, root, games) %{_bindir}/gnobots2
 %attr(2551, root, games) %{_bindir}/quadrapassel
-## %attr(2551, root, games) %{_bindir}/gnome-falling-blocks
 %attr(2551, root, games) %{_bindir}/gnotravex
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles
 %attr(2551, root, games) %{_bindir}/glines
 %attr(2551, root, games) %{_bindir}/iagno
-%attr(2551, root, games) %{_bindir}/lightsoff
-%attr(2551, root, games) %{_bindir}/swell-foop
+## %attr(2551, root, games) %{_bindir}/same-gnome
+## %attr(2551, root, games) %{_bindir}/gnome-falling-blocks
 
 
 %changelog
+* Thu May 20 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.30.1-2
+- add BuildRequires: gobject-introspection-devel, gir-repository-devel
+- add Requires: seed
+- add Patch2(gnome-games-libs.patch) from FC package
+- remove configure option (--disable-introspection)
+
 * Sat May 01 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 2.30.1-1
 - new upstream release