Author: qboosh Date: Mon Oct 23 19:44:04 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - updated paths patch, switched to modular xorg - added c++ patch (needed for gcc 4) - release 13
---- Files affected: SPECS: xpat2.spec (1.27 -> 1.28) ---- Diffs: ================================================================ Index: SPECS/xpat2.spec diff -u SPECS/xpat2.spec:1.27 SPECS/xpat2.spec:1.28 --- SPECS/xpat2.spec:1.27 Sun Jul 4 22:33:20 2004 +++ SPECS/xpat2.spec Mon Oct 23 21:43:59 2006 @@ -5,7 +5,7 @@ Summary(pt_BR): X Patience - vários jogos de cartas Name: xpat2 Version: 1.07 -Release: 12 +Release: 13 License: distributable - most of it GPL Group: X11/Applications/Games Source0: ftp://metalab.unc.edu/pub/Linux/games/solitaires/%{name}-%{version}-src.tar.gz @@ -16,15 +16,16 @@ Patch1: %{name}-qt-locales.patch Patch2: %{name}-fixes.patch Patch3: %{name}-qtmt.patch -BuildRequires: XFree86-devel -BuildRequires: XFree86 +Patch4: %{name}-c++.patch BuildRequires: qt-devel BuildRequires: tetex-dvips BuildRequires: tetex-latex +BuildRequires: xorg-cf-files +BuildRequires: xorg-lib-libXpm-devel +BuildRequires: xorg-util-imake +Requires: xorg-lib-libXt >= 1.0.0 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. Xpat2 can be used with different rules sets, so it can be used to play @@ -49,11 +50,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # moc files generated for old Qt - removing them causes regeneration for new rm -f src/{moc_*,mqmaskedit,mqhelpwin}.cpp -%build cd lib mv -f german de mv -f french fr @@ -63,11 +64,15 @@ rm -f src/moc* rm -f src/mqmaskedit.cpp rm -f src/mqhelpwin.cpp -cd ../src + +%build +cd src xmkmf %{__make} \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CCOPTIONS="%{rpmcflags}" \ - CXXOPTIONS="%{rpmcflags}" + CXXOPTIONS="%{rpmcxxflags}" cd .. %{__make} manual @@ -78,8 +83,9 @@ $RPM_BUILD_ROOT/var/games %{__make} install \ + DESTDIR=$RPM_BUILD_ROOT \ BINDIR=%{_bindir} \ - DESTDIR=$RPM_BUILD_ROOT + XAPPLOADDIR=%{_datadir}/X11/app-defaults install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir} @@ -101,11 +107,11 @@ %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 +%{_datadir}/X11/app-defaults/XPat +%lang(de) %{_datadir}/X11/de/app-defaults/XPat +%lang(fr) %{_datadir}/X11/fr/app-defaults/XPat +%lang(it) %{_datadir}/X11/it/app-defaults/XPat +%lang(ru) %{_datadir}/X11/ru/app-defaults/XPat %{_desktopdir}/* %{_pixmapsdir}/* @@ -115,6 +121,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2006/10/23 19:43:59 qboosh +- updated paths patch, switched to modular xorg +- added c++ patch (needed for gcc 4) +- release 13 + Revision 1.27 2004/07/04 20:33:20 adamg - applnk -> vfolders; release 12 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xpat2.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
