- C++ fix needed by gcc 4

[packages/xpat2.git] / xpat2.spec

diff --git a/xpat2.spec b/xpat2.spec
index 93db2a615393b12b8e563c9207bc9e1b93eff506..6c487ef3dc8308f14770185706cd11242576595a 100644 (file)
--- a/xpat2.spec
+++ b/xpat2.spec
@@ -4,7 +4,7 @@ Summary(pl):    Zestaw pasjans
 Summary(pt_BR):        X Patience - vários jogos de cartas
 Name:          xpat2
 Version:       1.07
-Release:       11
+Release:       12
 License:       distributable - most of it GPL
 Group:         X11/Applications/Games
 Source0:       ftp://metalab.unc.edu/pub/Linux/games/solitaires/%{name}-%{version}-src.tar.gz
@@ -22,7 +22,7 @@ BuildRequires:        tetex-dvips
 BuildRequires: tetex-latex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                appdefsdir      /usr/X11R6/lib/X11/app-defaults
+%define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
 
 %description
 Xpat2 is a generic patience or Solitaire game for the X Window System.
@@ -73,14 +73,14 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games/Card,%{_pixmapsdir}} \
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
        $RPM_BUILD_ROOT/var/games
 
 %{__make} install \
        BINDIR=%{_bindir} \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games/Card
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 :> $RPM_BUILD_ROOT/var/games/xpat.log
@@ -100,10 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/xpat/fr
 %lang(it) %{_datadir}/xpat/it
 %lang(ru) %{_datadir}/xpat/ru
-%{appdefsdir}/XPat
-%lang(de) %{appdefsdir}/de/XPat
-%lang(fr) %{appdefsdir}/fr/XPat
-%lang(it) %{appdefsdir}/it/XPat
-%lang(ru) %{appdefsdir}/ru/XPat
-%{_applnkdir}/Games/Card/xpat2.desktop
+%{_appdefsdir}/XPat
+%lang(de) %{_appdefsdir}/de/XPat
+%lang(fr) %{_appdefsdir}/fr/XPat
+%lang(it) %{_appdefsdir}/it/XPat
+%lang(ru) %{_appdefsdir}/ru/XPat
+%{_desktopdir}/*
 %{_pixmapsdir}/*