rpms/kdegames/devel kdegames.spec,1.122,1.123

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28932

Modified Files:
	kdegames.spec 
Log Message:
* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
- fix ggz scriptlet logic



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- kdegames.spec	1 Apr 2009 18:51:36 -0000	1.122
+++ kdegames.spec	2 Apr 2009 16:58:32 -0000	1.123
@@ -1,10 +1,9 @@
-%{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -27,8 +26,12 @@
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%if "%{?_ggz_version}" < "0.99.5"
+%define _skip_ggzconfig -DSKIP_GGZCONFIG=1
 Requires(post): ggz-client-libs
 Requires(preun): ggz-client-libs
+%endif
 
 %description
 Games for the K Desktop Environment 4, including:
@@ -91,7 +94,7 @@
 
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} %{?_skip_ggzconfig} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -102,19 +105,19 @@
 
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-# HACK, FIXME
+%if 0%{?_skip_ggzconfig:1}
 install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc
 install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc
 install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc
-
-# unpackaged files
-rm -f %{buildroot}%{_sysconfdir}/ggz.modules
+%endif
 
 
 %post
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||:
+%endif
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/locolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -136,12 +139,14 @@
 update-desktop-database -q &> /dev/null ||:
 fi
 
+%if 0%{?_skip_ggzconfig:1}
 %preun
 if [ $1 -eq 0 ]; then
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||:
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -167,10 +172,13 @@
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/locolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
+%if 0%{?_skip_ggzconfig:1}
 %{_ggz_datadir}/kbattleship.dsc
 %{_ggz_datadir}/kreversi.dsc
 %{_ggz_datadir}/ksquares.dsc
-%{_sysconfdir}/ggz.modules.d/kdegames
+%else
+%{_ggz_configdir}/ggz.modules.d/kdegames
+%endif
 
 %files libs
 %defattr(-,root,root,-)
@@ -185,6 +193,9 @@
 
 
 %changelog
+* Thu Apr 02 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-3
+- fix ggz scriptlet logic
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets