rpms/kdegames/devel kdegames.spec,1.79,1.80

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5671

Modified Files:
	kdegames.spec 
Log Message:
* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-4
- use new macros.ggz



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdegames.spec	7 Feb 2008 14:19:09 -0000	1.79
+++ kdegames.spec	8 Feb 2008 15:03:58 -0000	1.80
@@ -1,11 +1,11 @@
 
-%global ggzdatadir %(ggz-config --datadir >& /dev/null ||:)
+%{!?_ggz_datadir:%define _ggz_datadir %(ggz-config --datadir >& /dev/null ||:)}
 
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games 
 Epoch:   6
 Version: 4.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -109,24 +109,24 @@
 popd
 
 # HACK, FIXME
-install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{ggzdatadir}/kbattleship.dsc
-install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{ggzdatadir}/kreversi.dsc
+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
 
 # unpackaged files
 rm -f %{buildroot}%{_sysconfdir}/ggz.modules
 
 
 %post
-ggz-config --install --modfile=%{ggzdatadir}/kbattleship.dsc ||:
-ggz-config --install --modfile=%{ggzdatadir}/kreversi.dsc ||:
+%{_ggz_config} --install --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%{_ggz_config} --install --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %preun
 if [ $1 -eq 0 ]; then
-ggz-config --remove --modfile=%{ggzdatadir}/kbattleship.dsc ||:
-ggz-config --remove --modfile=%{ggzdatadir}/kreversi.dsc ||:
+%{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||:
+%{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||:
 fi
 
 %postun 
@@ -155,8 +155,8 @@
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{ggzdatadir}/kbattleship.dsc
-%{ggzdatadir}/kreversi.dsc
+%{_ggz_datadir}/kbattleship.dsc
+%{_ggz_datadir}/kreversi.dsc
 
 %files libs 
 %defattr(-,root,root,-)
@@ -172,6 +172,9 @@
 
 
 %changelog
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-4
+- use new macros.ggz
+
 * Thu Feb 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.1-3
 - Requires(post,preun): ggz-client-libs (for ggz-config)