- C++ fix needed by gcc 4

[packages/xpat2.git] / xpat2.spec

diff --git a/xpat2.spec b/xpat2.spec
index 0f593086720557d628ef8ee45418dde4da77352d..6c487ef3dc8308f14770185706cd11242576595a 100644 (file)
--- a/xpat2.spec
+++ b/xpat2.spec
@@ -4,15 +4,17 @@ Summary(pl):  Zestaw pasjans
 Summary(pt_BR):        X Patience - vários jogos de cartas
 Name:          xpat2
 Version:       1.07
-Release:       10
+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
+# Source0-md5: fb2c845e3411ce39376da66c7aec2448
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-qt-locales.patch
 Patch2:                %{name}-fixes.patch
+Patch3:                %{name}-qtmt.patch
 BuildRequires: XFree86-devel
 BuildRequires: XFree86
 BuildRequires: qt-devel
@@ -20,6 +22,7 @@ BuildRequires:        tetex-dvips
 BuildRequires: tetex-latex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _appdefsdir     /usr/X11R6/lib/X11/app-defaults
 
 %description
 Xpat2 is a generic patience or Solitaire game for the X Window System.
@@ -44,6 +47,7 @@ paci
 %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
@@ -60,19 +64,23 @@ 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/Card,%{_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/Card
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 :> $RPM_BUILD_ROOT/var/games/xpat.log
@@ -92,10 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_datadir}/xpat/fr
 %lang(it) %{_datadir}/xpat/it
 %lang(ru) %{_datadir}/xpat/ru
-%{_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/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}/*