- C++ fix needed by gcc 4

[packages/xpat2.git] / xpat2.spec

diff --git a/xpat2.spec b/xpat2.spec
index 599cca27807c0999b13da37a70fe4251e47a1ae7..6c487ef3dc8308f14770185706cd11242576595a 100644 (file)
--- a/xpat2.spec
+++ b/xpat2.spec
@@ -1,23 +1,28 @@
 Summary:       A set of Solitaire type games for the X Window System
+Summary(es):   X Patience - varios juegos de cartas
 Summary(pl):   Zestaw pasjansów dla X Window System
+Summary(pt_BR):        X Patience - vários jogos de cartas
 Name:          xpat2
 Version:       1.07
-Release:       1
+Release:       12
 License:       distributable - most of it GPL
-Group:         Games
+Group:         X11/Applications/Games
 Source0:       ftp://metalab.unc.edu/pub/Linux/games/solitaires/%{name}-%{version}-src.tar.gz
+# Source0-md5: fb2c845e3411ce39376da66c7aec2448
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-qt-locales.patch
-BuildRequires: tetex-dvips
-BuildRequires: tetex-latex
+Patch2:                %{name}-fixes.patch
+Patch3:                %{name}-qtmt.patch
 BuildRequires: XFree86-devel
+BuildRequires: XFree86
 BuildRequires: qt-devel
+BuildRequires: tetex-dvips
+BuildRequires: tetex-latex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _prefix         /usr/X11R6
-%define         _mandir         %{_prefix}/man
+%define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
 
 %description
 Xpat2 is a generic patience or Solitaire game for the X Window System.
@@ -25,12 +30,27 @@ Xpat2 can be used with different rules sets, so it can be used to play
 Spider, Klondike, and other card games.
 
 %description -l pl
-Xpat2 jest zestawem pasjansów dla X Window.
+Xpat2 jest zestawem pasjansów dla X Window. Mo¿e byæ u¿ywany z wieloma
+ró¿nymi zasadami; mo¿na graæ w Spidera, Klondike i inne gry karciane.
+
+%description -l pt_BR
+Em 1989, Dave Lemke, Heather Rose, Donald R. Woods e a Sun
+Microsystems, Inc., criaram o jogo de paciência xsol (também conhecido
+como klondike no DOS) e as regras de alguns outros jogos de paciência.
+As características principais são variáveis com conjuntos de regras e
+diferentes conjuntos de cartas para diferentes resoluções de
+monitores. xpat2 (X Patience) é uma coleção destes variados jogos de
+paciência que irão realmente "testar a sua paciência".
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+# moc files generated for old Qt - removing them causes regeneration for new
+rm -f src/{moc_*,mqmaskedit,mqhelpwin}.cpp
 
 %build
 cd lib
@@ -39,42 +59,51 @@ mv -f french fr
 mv -f italian it
 mv -f russian ru
 rm -f de_DE fr_FR it_IT
+rm -f src/moc*
+rm -f src/mqmaskedit.cpp
+rm -f src/mqhelpwin.cpp
 cd ../src
 xmkmf
-%{__make} CCOPTIONS="%{rpmcflags}" CXXOPTIONS="%{rpmcflags}"
+%{__make} \
+       CCOPTIONS="%{rpmcflags}" \
+       CXXOPTIONS="%{rpmcflags}"
 
 cd ..
 %{__make} manual
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
+       $RPM_BUILD_ROOT/var/games
 
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install \
+       BINDIR=%{_bindir} \
+       DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-gzip -9nf README doc/xpat2.ps
+:> $RPM_BUILD_ROOT/var/games/xpat.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.gz doc/xpat2.ps.gz
+%doc README doc/xpat2.ps
+%attr(2755,root,games) %{_bindir}/xpat2
+%attr(664,root,games) /var/games/xpat.log
+%{_mandir}/man6/*
 %dir %{_datadir}/xpat
 %{_datadir}/xpat/???*
 %lang(de) %{_datadir}/xpat/de
 %lang(fr) %{_datadir}/xpat/fr
 %lang(it) %{_datadir}/xpat/it
 %lang(ru) %{_datadir}/xpat/ru
-%{_mandir}/man6/*
-%attr(755,root,root) %{_bindir}/xpat2
-%{_libdir}/X11/app-defaults/XPat
-%lang(de) %{_libdir}/X11/app-defaults/de/XPat
-%lang(fr) %{_libdir}/X11/app-defaults/fr/XPat
-%lang(it) %{_libdir}/X11/app-defaults/it/XPat
-%lang(ru) %{_libdir}/X11/app-defaults/ru/XPat
-%config(noreplace) %{_applnkdir}/Games/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}/*