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

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gnome-games.spec 
Log Message:
and remove ggz bits


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- gnome-games.spec	1 Dec 2009 17:34:20 -0000	1.236
+++ gnome-games.spec	1 Dec 2009 18:57:18 -0000	1.237
@@ -85,9 +85,6 @@ BuildRequires: gettext
 BuildRequires: autoconf >= 2.60
 BuildRequires: gnome-doc-utils >= 0.3.2
 
-BuildRequires: libggz-devel
-BuildRequires: ggz-client-libs-devel
-Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
 
 Provides: gnome-sudoku
@@ -179,11 +176,6 @@ desktop-file-install --vendor gnome --de
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
 %endif
 
-# we need this in %%post
-cp gnect/data/gnect-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-cp gnibbles/gnibbles-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-cp iagno/iagno-client.dsc $RPM_BUILD_ROOT%{_datadir}/ggz
-
 # but we don't want this
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ggz.modules
 
@@ -210,8 +202,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-ggz-config -i -f -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
-
 %post extra
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
@@ -234,9 +224,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-ggz-config -i -f -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-ggz-config -i -f -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -282,7 +269,9 @@ if [ "$1" -eq 0 ]; then
 	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
-  ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+  if test -f %{_datadir}/ggz/iagno-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+  fi
 fi
 
 %preun extra
@@ -304,8 +293,12 @@ if [ "$1" -eq 0 ]; then
 	mahjongg.schemas            \
 > /dev/null || : )
 
-  ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
-  ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
+  if test -f %{_datadir}/ggz/gnect-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
+  fi
+  if test -f %{_datadir}/ggz/gnibbles-client.dsc ; then
+    ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
+  fi
 fi
 
 %postun
@@ -364,9 +357,6 @@ fi
 %{_sysconfdir}/gconf/schemas/same-gnome.schemas
 %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
 
-%{_datadir}/ggz/gnome-games
-%{_datadir}/ggz/iagno-client.dsc
-
 # these are not setgid games
 %{_bindir}/sol
 %{_bindir}/gnome-sudoku
@@ -469,9 +459,6 @@ fi
 %{_datadir}/gnome-games/mahjongg
 %{_datadir}/gnome-games/gnotski
 
-%{_datadir}/ggz/gnect-client.dsc
-%{_datadir}/ggz/gnibbles-client.dsc
-
 %{_datadir}/icons/hicolor/*/apps/gnome-blackjack.*
 %{_datadir}/icons/hicolor/*/apps/gnome-freecell.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glchess.*