From 8b46428d133ee9f2e0f9d5bab8c8d5ad002a0e10 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 08 2008 15:03:58 +0000 Subject: - use new macros.ggz --- diff --git a/kdegames.spec b/kdegames.spec index d173fbe..44aa71a 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -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 @@ ln -sf "../../$linktarget" "kde4/devel/libkdegames.so" 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 @@ rm -rf %{buildroot} %{_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 @@ rm -rf %{buildroot} %changelog +* Fri Feb 08 2008 Rex Dieter 4.0.1-4 +- use new macros.ggz + * Thu Feb 07 2008 Rex Dieter 4.0.1-3 - Requires(post,preun): ggz-client-libs (for ggz-config)