rpms/gnome-games/devel gnome-games-rsvg.patch, NONE, 1.1 gnome-games.spec, 1.267, 1.268

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1016

Modified Files:
	gnome-games.spec 
Added Files:
	gnome-games-rsvg.patch 
Log Message:
2.31.4


gnome-games-rsvg.patch:
 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gnome-games-rsvg.patch ---
diff -up gnome-games-2.31.4/configure.in.rsvg gnome-games-2.31.4/configure.in
--- gnome-games-2.31.4/configure.in.rsvg	2010-06-30 21:18:35.962058478 -0400
+++ gnome-games-2.31.4/configure.in	2010-06-30 21:20:46.256059734 -0400
@@ -318,7 +318,7 @@ case "$with_gtk" in
   2.0) GTK_API_VERSION=2.0
        GTK_API_MAJOR_VERSION=2
        ;;
-  2.0) GTK_API_VERSION=3.0
+  3.0) GTK_API_VERSION=3.0
        GTK_API_MAJOR_VERSION=3
        ;;
 esac
@@ -608,7 +608,7 @@ if test "$need_rsvg" = "yes"; then
 
   # Errors out if rsvg is not found
   PKG_CHECK_MODULES([RSVG],[
-    librsvg-$GTK_API_VERSION >= $RSVG_REQUIRED
+    librsvg-2.0 >= $RSVG_REQUIRED
     cairo >= $CAIRO_REQUIRED])
 
   AC_SUBST([RSVG_CFLAGS])


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- gnome-games.spec	29 Jun 2010 13:50:31 -0000	1.267
+++ gnome-games.spec	1 Jul 2010 03:08:35 -0000	1.268
@@ -52,6 +52,7 @@ Group: Amusements/Games
 Source: http://download.gnome.org/sources/gnome-games/2.31/gnome-games-%{version}.tar.bz2
 
 Patch0: lsb-really?.patch
+Patch1: gnome-games-rsvg.patch
 
 Obsoletes: gnome-games-devel
 URL: http://projects.gnome.org/gnome-games/
@@ -67,7 +68,7 @@ Requires: hicolor-icon-theme
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk2-devel
 BuildRequires: pygtk2-devel
 BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -126,6 +127,7 @@ This package contains user documentation
 %prep
 %setup -q
 %patch0 -p1 -b .no-lsb
+%patch1 -p1 -b .rsvg
 
 autoreconf -i -f
 
@@ -133,6 +135,7 @@ autoreconf -i -f
 %configure --localstatedir=/var/lib \
            --disable-gnuchess \
            --disable-introspection \
+           --with-gtk=2.0 \
            %{omitgames}
 make
 
@@ -438,8 +441,6 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_sysconfdir}/gconf/schemas/mahjongg.schemas
 %{_sysconfdir}/gconf/schemas/glchess.schemas
 
-%{_datadir}/glib-2.0/schemas/org.gnome.Games.WindowState.gschema.xml
-
 %{_datadir}/gnome-games/glines
 %{_datadir}/gnome-games/gnect
 %{_datadir}/gnome-games/gnibbles