- fixes build flags

- /usr/X11R6/lib/games/xpat -> /usr/X11R6/share, standarized app-defaults dirs
- qt-path patch replaced by longer paths patch
- added .ps doc instead of .tex to binary package
- marked all localized resources with %%lang()
- qt version didn't support locales - qt-locales patch adds partial support

Changed files:
    xpat2-paths.patch -> 1.1
    xpat2-qt-locales.patch -> 1.1
    xpat2-qt-path.patch -> 1.2
    xpat2.spec -> 1.6

diff --git a/xpat2-paths.patch b/xpat2-paths.patch
new file mode 100644 (file)
index 0000000..c01296e
--- /dev/null
+++ b/xpat2-paths.patch
@@ -0,0 +1,113 @@
+diff -Nur xpat2-1.07.orig/lib/french/XPat xpat2-1.07/lib/french/XPat
+--- xpat2-1.07.orig/lib/french/XPat    Tue Feb 14 08:31:48 1995
++++ xpat2-1.07/lib/french/XPat Thu Oct  4 19:30:45 2001
+@@ -1,4 +1,4 @@
+-#include "../../app-defaults/XPat"
++#include "../XPat"
+ XPat*Dialog*Translations: #override \n\
+ <Key>o: Ok()\n\
+ <Key>n: Cancel()\n
+diff -Nur xpat2-1.07.orig/lib/german/XPat xpat2-1.07/lib/german/XPat
+--- xpat2-1.07.orig/lib/german/XPat    Mon Feb 13 18:57:06 1995
++++ xpat2-1.07/lib/german/XPat Thu Oct  4 19:30:36 2001
+@@ -1,4 +1,4 @@
+-#include "../../app-defaults/XPat"
++#include "../XPat"
+ XPat*Dialog*Translations: #override \n\
+ <Key>j: Ok()\n\
+ <Key>n: Cancel()\n
+diff -Nur xpat2-1.07.orig/lib/italian/XPat xpat2-1.07/lib/italian/XPat
+--- xpat2-1.07.orig/lib/italian/XPat   Thu Jun 23 18:39:18 1994
++++ xpat2-1.07/lib/italian/XPat        Thu Oct  4 19:30:52 2001
+@@ -1,4 +1,4 @@
+-#include "../../app-defaults/XPat"
++#include "../XPat"
+ XPat*Dialog*Translations: #override \n\
+ <Key>s: Ok()\n\
+ <Key>n: Cancel()\n
+diff -Nur xpat2-1.07.orig/src/Imakefile xpat2-1.07/src/Imakefile
+--- xpat2-1.07.orig/src/Imakefile      Sun Nov  5 20:05:10 2000
++++ xpat2-1.07/src/Imakefile   Thu Oct  4 19:26:14 2001
+@@ -192,7 +192,7 @@
+ 
+ 
+ MYPROG                = xpat2
+-LANGUAGES     = italian german russian french de_DE fr_FR it_IT
++LANGUAGES     = de fr it ru
+ DEFINES               = $(LOAD_OPTION) $(HELP_OPTION) $(KIT_OPTION) $(ROUND_OPTION) \
+                 $(SOUND_OPTION) $(XPM_OPTION) $(GFX_OPTION) \
+                 -DSCOREFILE=\"$(SCOREFILE)\" -DLIBDIR=\"$(XPATLIBDIR)\"
+@@ -208,13 +208,12 @@
+       mkdirhier $(XPATLIBDIR)
+       chmod 755 $(XPATLIBDIR)
+       for f in $(LANGUAGES); do \
+-        mkdirhier $(APPDEFSDIR)/$$f/app-defaults; \
+-        cp ../lib/$$f/XPat $(APPDEFSDIR)/$$f/app-defaults; \
+-        chmod 755 $(APPDEFSDIR)/$$f/app-defaults; \
+-        chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
++        mkdirhier $(APPDEFSDIR)/app-defaults/$$f; \
++        cp ../lib/$$f/XPat $(APPDEFSDIR)/app-defaults/$$f; \
++        chmod 755 $(APPDEFSDIR)/app-defaults/$$f; \
++        chmod 644 $(APPDEFSDIR)/app-defaults/$$f/XPat; \
+       done 
+       (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
+-      chown -R root $(XPATLIBDIR)
+       chmod -R a+r $(XPATLIBDIR)
+       for f in $(LANGUAGES); do \
+           chmod 755 $(XPATLIBDIR)/$$f; \
+diff -Nur xpat2-1.07.orig/src/Xpat.tmpl xpat2-1.07/src/Xpat.tmpl
+--- xpat2-1.07.orig/src/Xpat.tmpl      Sun Nov  5 21:03:10 2000
++++ xpat2-1.07/src/Xpat.tmpl   Thu Oct  4 19:06:05 2001
+@@ -161,13 +161,13 @@
+ XCOMM #########################################################################
+ 
+ XCOMM Root directory of xpat2 installation
+-XPATROOT      = /usr/games/lib/xpat
++XPATROOT      = /usr/X11R6/share/xpat
+ XCOMM XPATROOT        = /usr/local/lib/xpat
+ XCOMM XPATROOT        = /opt/XPat2
+ 
+-XPATLIBDIR    = $(XPATROOT)
+-APPDEFSDIR    = $(LIBDIR)
+-XPATMANDIR    = $(XPATROOT)/man/man6
++XPATLIBDIR    = $(DESTDIR)$(XPATROOT)
++APPDEFSDIR    = $(DESTDIR)$(LIBDIR)
++XPATMANDIR    = $(DESTDIR)/usr/X11R6/man/man6
+ 
+ XCOMM This is the name of the log-file, where solved games are stored:
+ SCOREFILE     = /var/games/xpat.log
+@@ -180,8 +180,8 @@
+ 
+ XCOMM Paths for the Qt interface
+ XCOMM QTDIR   = /usr/lib/qt1
+-QTDIR         = /usr/local/qt
+-QTINCDIR      = $(QTDIR)/include
++QTDIR         = /usr/X11R6
++QTINCDIR      = $(QTDIR)/include/qt
+ QTLIBDIR      = $(QTDIR)/lib
+ MOC           = $(QTDIR)/bin/moc
+ 
+diff -Nur xpat2-1.07.orig/src/messages.c xpat2-1.07/src/messages.c
+--- xpat2-1.07.orig/src/messages.c     Wed May  5 22:04:48 1999
++++ xpat2-1.07/src/messages.c  Thu Oct  4 19:27:45 2001
+@@ -214,15 +214,15 @@
+     iso_code[2] = '\0';
+     /* map the existing translations (iso3166) to well-known pathnames */
+     if (!strcmp(iso_code, "DE"))
+-      return langdir = "german";
++      return langdir = "de";
+     if (!strcmp(iso_code, "IT"))
+-      return langdir = "italian";
++      return langdir = "it";
+     if (!strcmp(iso_code, "FR"))
+-      return langdir = "french";
++      return langdir = "fr";
+     if (!strcmp(iso_code, ""))
+-      return langdir = "german";
++      return langdir = "de";
+     if (!strcmp(iso_code, "RU") || !strcmp(iso_code, "BY"))
+-      return langdir = "russian";
++      return langdir = "ru";
+ #ifdef _POSIX_SOURCE
+     /* directory wasn't readable, reset it */
+     return langdir = "";

diff --git a/xpat2-qt-locales.patch b/xpat2-qt-locales.patch
new file mode 100644 (file)
index 0000000..c667042
--- /dev/null
+++ b/xpat2-qt-locales.patch
@@ -0,0 +1,26 @@
+--- xpat2-1.07/src/XQt-main.cpp.orig   Sun Nov  5 21:12:35 2000
++++ xpat2-1.07/src/XQt-main.cpp        Thu Oct  4 20:07:24 2001
+@@ -61,7 +61,7 @@
+        (decks != -1 || Xslots != -1 || faceup != -1 || facedown != -1))
+         fprintf(stderr, "warning: customization parameters are ignored\n");
+ 
+-
++    read_message_file("messages");
+     XQtXPat2Window * mw = new XQtXPat2Window(ruleset, seed);
+       mw->resize(800,600);
+     a.setMainWidget(mw);
+--- xpat2-1.07/src/messages.c.orig     Wed May  5 22:04:48 1999
++++ xpat2-1.07/src/messages.c  Thu Oct  4 20:14:43 2001
+@@ -183,7 +183,11 @@
+       return langdir;         /* directory was checked before */
+ 
+     /* first call, read environment */
+-    langdir = getenv("LANG");
++    langdir = getenv("LC_ALL");
++    if(!langdir)
++        langdir = getenv("LC_MESSAGES");
++    if(!langdir)
++      langdir = getenv("LANG");
+     if (!langdir)
+       langdir = "";           /* set to empty */
+     if (!*langdir)

diff --git a/xpat2-qt-path.patch b/xpat2-qt-path.patch
deleted file mode 100644 (file)
index d229570..0000000
--- a/xpat2-qt-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- src/Xpat.tmpl.old  Wed Sep 26 00:16:03 2001
-+++ src/Xpat.tmpl      Wed Sep 26 00:17:25 2001
-@@ -180,8 +180,8 @@
- 
- XCOMM Paths for the Qt interface
- XCOMM QTDIR   = /usr/lib/qt1
--QTDIR         = /usr/local/qt
--QTINCDIR      = $(QTDIR)/include
-+QTDIR         = /usr/X11R6
-+QTINCDIR      = $(QTDIR)/include/qt
- QTLIBDIR      = $(QTDIR)/lib
- MOC           = $(QTDIR)/bin/moc
- 
---- src/Xpat.tmpl~     Wed Sep 26 00:25:39 2001
-+++ src/Xpat.tmpl      Wed Sep 26 00:32:40 2001
-@@ -161,13 +161,13 @@
- XCOMM #########################################################################
- 
- XCOMM Root directory of xpat2 installation
--XPATROOT      = /usr/games/lib/xpat
-+XPATROOT      = /usr/X11R6/lib/games/xpat
- XCOMM XPATROOT        = /usr/local/lib/xpat
- XCOMM XPATROOT        = /opt/XPat2
- 
--XPATLIBDIR    = $(XPATROOT)
--APPDEFSDIR    = $(LIBDIR)
--XPATMANDIR    = $(XPATROOT)/man/man6
-+XPATLIBDIR    = $(DESTDIR)$(XPATROOT)
-+APPDEFSDIR    = $(DESTDIR)$(LIBDIR)
-+XPATMANDIR    = $(DESTDIR)/usr/X11R6/man/man6
- 
- XCOMM This is the name of the log-file, where solved games are stored:
- SCOREFILE     = /var/games/xpat.log
---- src/Imakefile.3    Wed Sep 26 00:36:16 2001
-+++ src/Imakefile      Wed Sep 26 00:36:39 2001
-@@ -214,7 +214,6 @@
-         chmod 644 $(APPDEFSDIR)/$$f/app-defaults/XPat; \
-       done 
-       (cd ../lib; tar cf - * | (cd $(XPATLIBDIR); tar xf -))
--      chown -R root $(XPATLIBDIR)
-       chmod -R a+r $(XPATLIBDIR)
-       for f in $(LANGUAGES); do \
-           chmod 755 $(XPATLIBDIR)/$$f; \

diff --git a/xpat2.spec b/xpat2.spec
index dc60ad2bc030fe8ae9ae39e21d655d0d2c1c9c29..9f912f53434627a4c1cf0761dfa17c887ee76d5c 100644 (file)
--- a/xpat2.spec
+++ b/xpat2.spec
@@ -8,10 +8,8 @@ Group:         Games
 Source0:       ftp://metalab.unc.edu/pub/Linux/games/solitaires/%{name}-%{version}-src.tar.gz
 Source1:       %{name}.desktop
 Source2:       %{name}.png
-Patch0:                %{name}-qt-path.patch
-# Patch0:              %{name}-1.03-fsstnd.patch
-# Patch1:              %{name}.nomkdirhier.patch
-# Patch2:              %{name}-1.06-nochown.patch
+Patch0:                %{name}-paths.patch
+Patch1:                %{name}-qt-locales.patch
 BuildRequires: tetex-dvips
 BuildRequires: tetex-latex
 BuildRequires: XFree86-devel
@@ -31,41 +29,52 @@ Xpat2 jest zestawem pasjans
 
 %prep
 %setup -q
-%patch -p0
-#%patch1 -p0
-#%patch2 -p1
+%patch -p1
+%patch1 -p1
 
 %build
-export PATH=%{_bindir}/X11:$PATH
-%{__make} CDEBUGFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcflags}"
+cd lib
+mv -f german de
+mv -f french fr
+mv -f italian it
+mv -f russian ru
+rm -f de_DE fr_FR it_IT
+cd ../src
+xmkmf
+%{__make} CDEBUGFLAGS="%{rpmcflags}" CXXDEBUGFLAGS="%{rpmcflags}"
+
+cd ..
+%{__make} manual
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Games
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_libdir}/games/xpat
-install -d $RPM_BUILD_ROOT%{_mandir}/man6
-install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/{italian,german,russian,french}/app-defaults
-install -d $RPM_BUILD_ROOT%{_pixmapsdir}
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games,%{_pixmapsdir}}
 
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+gzip -9nf README doc/xpat2.ps
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README doc/xpat2.tex
-%{_libdir}/games/xpat
-%{_mandir}/*/*
+%doc README.gz doc/xpat2.ps.gz
+%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/german/app-defaults/XPat
-%lang(fr) %{_libdir}/X11/french/app-defaults/XPat
-%lang(it) %{_libdir}/X11/italian/app-defaults/XPat
-%lang(ru) %{_libdir}/X11/russian/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
 %{_pixmapsdir}/*