rpms/gnome-games/devel gnome-games.spec,1.235,1.236

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17004

Modified Files:
	gnome-games.spec 
Log Message:
fix schemas and install for gnometris again


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- gnome-games.spec	1 Dec 2009 17:14:17 -0000	1.235
+++ gnome-games.spec	1 Dec 2009 17:34:20 -0000	1.236
@@ -157,9 +157,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INS
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-mv $RPM_BUILD_ROOT%{_bindir}/gnometris \
-  $RPM_BUILD_ROOT%{_bindir}/gnome-falling-blocks
-
 ## things we just don't want in the package
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
@@ -226,7 +223,7 @@ gconftool-2 --makefile-install-rule \
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
+	quadrapassel.schemas        \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \
@@ -257,6 +254,8 @@ fi
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
@@ -265,7 +264,6 @@ if [ "$1" -gt 1 ]; then
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \
@@ -291,6 +289,8 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   (cd %{_sysconfdir}/gconf/schemas;   \
+  if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
+  if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
@@ -299,7 +299,6 @@ if [ "$1" -eq 0 ]; then
 	gnect.schemas               \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
-	gnometris.schemas           \
 	gnotravex.schemas           \
 	gnotski.schemas             \
 	mahjongg.schemas            \