--- a/ChangeLog	Thu Feb 28 19:29:05 2008 +0000
+++ b/ChangeLog	Thu Feb 28 21:17:05 2008 +0000
@@ -1,3 +1,11 @@
+2008-02-28  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-games, base-specs/ggz-python.spec,
+	  patches/ggz-python-01-noisystem.diff,
+	  patches/ggz-python-02-fixmake.diff,
+	  patches/ggz-python-03-sysconfdir.diff:  Remove ggz-python.
+	  I was confused about these being needed.
+
 2008-02-28  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-games.spec, base-specs/gnome-games.spec:  Add

--- a/SUNWgnome-games.spec	Thu Feb 28 19:29:05 2008 +0000
+++ b/SUNWgnome-games.spec	Thu Feb 28 21:17:05 2008 +0000
@@ -15,7 +15,6 @@
 %use gnome_games = gnome-games.spec
 %use libggz = libggz.spec
 %use ggz_client_libs = ggz-client-libs.spec
-%use ggz_python = ggz-python.spec
 
 Name:                    SUNWgnome-games
 Summary:                 GNOME games
@@ -68,7 +67,6 @@
 mkdir %name-%version
 %libggz.prep -d %name-%version
 %ggz_client_libs.prep -d %name-%version
-%ggz_python.prep -d %name-%version
 %gnome_games.prep -d %name-%version
 
 %build
@@ -95,19 +93,19 @@
 
 %libggz.build -d %name-%version
 %ggz_client_libs.build -d %name-%version
-%ggz_python.build -d %name-%version
 %gnome_games.build -d %name-%version
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %libggz.install -d %name-%version
 %ggz_client_libs.install -d %name-%version
-%ggz_python.install -d %name-%version
 %gnome_games.install -d %name-%version
 
+# Remove the empty dir.
+rmdir $RPM_BUILD_ROOT%{_libdir}/ggz
+
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/lib/games
 rmdir $RPM_BUILD_ROOT%{_localstatedir}/lib
-rm -rf $RPM_BUILD_ROOT%{_localstatedir}/tmp
 rmdir $RPM_BUILD_ROOT%{_localstatedir}
 # Delete the include files as we're not delivering a devel package. It's not
 # useful.
@@ -183,9 +181,6 @@
 %{_bindir}/*
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/gnome-games
-%{_libdir}/ggz
-%{_libdir}/ggzd
-%{_libdir}/ggz-python
 %{_libdir}/libggz*
 %{_libdir}/python?.?/vendor-packages
 %dir %attr (0755, root, sys) %{_datadir}
@@ -249,7 +244,6 @@
 %{_sysconfdir}/gconf/schemas/same-gnome.schemas
 %{_sysconfdir}/gconf/schemas/mahjongg.schemas
 %{_sysconfdir}/xdg
-%{_sysconfdir}/ggzd
 
 #%files devel
 #%defattr (-, root, bin)
@@ -257,6 +251,8 @@
 #%{_includedir}/*
 
 %changelog
+* Thu Feb 28 2008 - [email protected]
+- Remove ggz-python since it isn't needed.  Sorry about the churn.
 * Wed Feb 27 2008 - [email protected]
 - Add gst-python, since glchess needs it.  Rename %{ggzmod_build_dir} to
   %{ggzclient_build_dir} since this is more accurate - the module is named

--- a/base-specs/ggz-python.spec	Thu Feb 28 19:29:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-#
-# spec file for package ggz-python
-#
-# Copyright (c) 2008 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Owner: migi
-#
-Name:         ggz-python
-License:      GPL
-Group:        Amusements/Games
-Version:      0.0.14.1
-Release:      1
-Distribution: Java Desktop System
-Vendor:	      Sun Microsystems, Inc.
-Summary:      GGZ online gaming
-Source:       http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/%{version}/ggz-python-%{version}.tar.gz
-# owner:yippi date:2008-02-28 type:bug bugzilla:519200
-Patch1:       ggz-python-01-noisystem.diff
-# owner:yippi date:2008-02-28 type:bug bugzilla:519202
-Patch2:       ggz-python-02-fixmake.diff
-# owner:yippi date:2008-02-28 type:bug bugzilla:519203
-Patch3:       ggz-python-03-sysconfdir.diff
-URL:          http://www.ggzgamingzone.org/
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Docdir:       %{_defaultdocdir}/%{name}
-Autoreqprov:  on
-Prereq:       GConf
-
-%define python_version 2.4
-
-%description
-Python bindings for GGZ (Gaming Zone)
-
-%prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-%build
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
-  CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
-  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-  CPUS=1
-fi
-
-aclocal $ACLOCAL_FLAGS
-autoconf
-
-# Note we disable ggzdmod since we don't currently build the GGZ server (ggzd)
-#
-./configure --prefix=%{_prefix} 	\
-	    --sysconfdir=%{_sysconfdir} \
-	    --bindir=%{_bindir} \
-	    --libdir=%{_libdir} \
-            --includedir=%{_includedir} \
-	    --libexecdir=%{_libexecdir} \
-	    --localstatedir=%{_localstatedir} \
-	    --disable-ggzdmod \
-            --with-libggz-includes=%{libggz_build_dir}/src \
-            --with-libggz-libraries=%{libggz_build_dir}/src/.libs \
-            --with-ggzmod-includes=%{ggzclient_build_dir}/ggzmod \
-            --with-ggzmod-libraries=%{ggzclient_build_dir}/ggzmod/.libs \
-            --with-ggzcore-includes=%{ggzclient_build_dir}/ggzcore \
-            --with-ggzcore-libraries=%{ggzclient_build_dir}/ggzcore/.libs \
-
-make -j $CPUS
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
-
-# Though ggz-python uses "make install", python distutils are used for
-# some parts of the build process, so it is necessary to use mv here.
-
-mv $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages \
-   $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/vendor-packages
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%changelog
-* Wed Feb 27 2008 - [email protected]
-- Created with version 0.0.14.1.

--- a/patches/ggz-python-01-noisystem.diff	Thu Feb 28 19:29:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
---- ggz-python-0.0.14.1/aclocal.m4-orig	2008-02-27 19:37:59.431974000 -0600
-+++ ggz-python-0.0.14.1/aclocal.m4	2008-02-27 19:39:04.196484000 -0600
-@@ -191,7 +191,9 @@ if test "x$1" = "xdefaults" || test "x$2
-   ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
- fi
- if test "x$1" = "xexport" || test "x$2" = "xexport"; then
--  CPPFLAGS="$CPPFLAGS -isystem ${ac_ggz_prefix_incdir} -isystem /usr/local/include"
-+  if test "$GCC" = yes; then
-+     CPPFLAGS="$CPPFLAGS -isystem ${ac_ggz_prefix_incdir} -isystem /usr/local/include"
-+  fi
-   LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
- fi
- 
-@@ -317,7 +319,9 @@ else
-   AC_SUBST(libggz_libraries)
-   AC_SUBST(libggz_includes)
- 
--  LIBGGZ_INCLUDES="-isystem $libggz_includes"
-+  if test "$GCC" = yes; then
-+     LIBGGZ_INCLUDES="-isystem $libggz_includes"
-+  fi
-   LIBGGZ_LDFLAGS="-L$libggz_libraries"
- 
-   AC_SUBST(LIBGGZ_INCLUDES)
-@@ -416,7 +420,9 @@ else
-   AC_SUBST(ggzcore_libraries)
-   AC_SUBST(ggzcore_includes)
- 
--  GGZCORE_INCLUDES="-isystem $ggzcore_includes"
-+  if test "$GCC" = yes; then
-+    GGZCORE_INCLUDES="-isystem $ggzcore_includes"
-+  fi
-   GGZCORE_LDFLAGS="-L$ggzcore_libraries"
- 
-   AC_SUBST(GGZCORE_INCLUDES)
-@@ -630,7 +636,9 @@ else
-   AC_SUBST(ggzmod_libraries)
-   AC_SUBST(ggzmod_includes)
- 
--  GGZMOD_INCLUDES="-isystem $ggzmod_includes"
-+  if test "$GCC" = yes; then
-+    GGZMOD_INCLUDES="-isystem $ggzmod_includes"
-+  fi
-   GGZMOD_LDFLAGS="-L$ggzmod_libraries"
- 
-   AC_SUBST(GGZMOD_INCLUDES)
-@@ -728,7 +736,9 @@ else
-   AC_SUBST(ggzdmod_libraries)
-   AC_SUBST(ggzdmod_includes)
- 
--  GGZDMOD_INCLUDES="-isystem $ggzdmod_includes"
-+  if test "$GCC" = yes; then
-+    GGZDMOD_INCLUDES="-isystem $ggzdmod_includes"
-+  fi
-   GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
- 
-   AC_SUBST(GGZDMOD_INCLUDES)
-@@ -826,7 +836,9 @@ else
-   AC_SUBST(ggz_gtk_libraries)
-   AC_SUBST(ggz_gtk_includes)
- 
--  GGZ_GTK_INCLUDES="-isystem $ggz_gtk_includes"
-+  if test "$GCC" = yes; then
-+    GGZ_GTK_INCLUDES="-isystem $ggz_gtk_includes"
-+  fi
-   GGZ_GTK_LDFLAGS="-L$ggz_gtk_libraries"
- 
-   AC_SUBST(GGZ_GTK_INCLUDES)

--- a/patches/ggz-python-02-fixmake.diff	Thu Feb 28 19:29:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- ggz-python-0.0.14.1/po/i18n.mk-orig	2008-02-27 20:10:40.095004000 -0600
-+++ ggz-python-0.0.14.1/po/i18n.mk	2008-02-27 20:11:30.707160000 -0600
-@@ -8,6 +8,7 @@ builddir = $(top_builddir)/$(subdir)
- POFILES = $(srcdir)/*.po
- MOFILES = $(builddir)/*.mo
- STAMP = $(builddir)/translation.stamp
-+SHELL= /bin/bash
- 
- all-local: $(STAMP)
- 

--- a/patches/ggz-python-03-sysconfdir.diff	Thu Feb 28 19:29:05 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- ggz-python-0.0.14.1/Makefile.in-orig	2008-02-27 22:34:15.212831000 -0600
-+++ ggz-python-0.0.14.1/Makefile.in	2008-02-27 22:35:02.171182000 -0600
-@@ -10,6 +10,8 @@ prefix = @prefix@
- bindir = @bindir@
- # datadir: For game data files (/usr/share)
- datadir = @datadir@
-+# sysconfdir: For game system configuration files (/etc)
-+sysconfdir = @sysconfdir@
- 
- # xdg_datadir: For desktop integration files (/usr/share/applications)
- xdg_datadir = @xdg_datadir@
-@@ -25,7 +27,6 @@ ggz-config = @GGZ_CONFIG@ -D
- 
- # some default autoconf variables
- exec_prefix = ${prefix}
--sysconfdir = ${prefix}/etc
- 
- ggzd_execmoddir = ${prefix}/lib/ggzd
- ggz_execmoddir = ${prefix}/lib/ggz