- spec adapterized.

Changed files:
    cxhextris.spec -> 1.6

diff --git a/cxhextris.spec b/cxhextris.spec
index 16e86ff0c60f86c17a73475f94ea1a960ecde04d..1fe7bbfcddf6c8bed3b5d73efcdfb02459fc4aff 100644 (file)
--- a/cxhextris.spec
+++ b/cxhextris.spec
@@ -1,24 +1,28 @@
-Summary: An X Window System color version of xhextris.
-Name: cxhextris
-Version: 1.0
-Release: 15
-Copyright: distributable
-Group: Amusements/Games
-Source: ftp://sunsite.unc.edu/pub/Linux/games/arcade/tetris/cxhextris.tar.z
-Source1: cxhextris.wmconfig
-Patch0: cxhextris-config.patch
-Patch1: cxhextris-axp.patch
-Patch2: cxhextris-security.patch
-Prereq: /usr/X11R6/bin/mkfontdir
+Summary:       An X Window System color version of xhextris
+Name:          cxhextris
+Version:       1.0
+Release:       15
+Copyright:     distributable
+Group:         X11/Games
+Group(pl):     X11/Gry
+Source0:       ftp://sunsite.unc.edu/pub/Linux/games/arcade/tetris/%{name}.tar.z
+Source1:       cxhextris.wmconfig
+Patch0:                cxhextris-config.patch
+Patch1:                cxhextris-axp.patch
+Patch2:                cxhextris-security.patch
+Prereq:                /usr/X11R6/bin/mkfontdir
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+
 %description
 CXHextris is a color version of the popular xhextris game, which is a
 Tetris-like game that uses hexagon shapes instead of square shapes.
 CXHextris runs within the X Window System.
 
 Install cxhextris if you enjoy playing Tetris or Tetris-like games and
-you'd like to play one on your system.  You'll need to have X installed
+you'd like to play one on your system. You'll need to have X installed
 in order to play CXHextris.
 
 %description -l pl
@@ -26,8 +30,8 @@ CXHextris jest kolorow
 Tetrisa u¿ywaj±cym sze¶ciobocznych figur zamiast kwadratowych.
 CXHextris uruchamia siê w ¶rodowisku X Window.
 
-Nale¿y zainstalowaæ CXHextris je¶li lubi siê gry w rodzaju Tetris. Aby móc 
-graæ w CXHextris nale¿y mieæ zainstalowane X Window.
+Nale¿y zainstalowaæ CXHextris je¶li lubi siê gry w rodzaju Tetris. Aby
+móc graæ w CXHextris nale¿y mieæ zainstalowane X Window.
 
 %prep
 %setup -q -n cxhextris
@@ -44,12 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install install.man
 
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc
-make FONTDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts install.font
+install -d $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts/misc
+make FONTDIR=$RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/fonts install.font
 
 ( cd $RPM_BUILD_ROOT
-  mkdir -p ./etc/X11/wmconfig
-  install -m 644 $RPM_SOURCE_DIR/cxhextris.wmconfig ./etc/X11/wmconfig/cxhextris
+install -d .%{_sysconfdir}/X11/wmconfig
+install $RPM_SOURCE_DIR/cxhextris.wmconfig .%{_sysconfdir}/X11/wmconfig/cxhextris
 )
 
 %clean
@@ -62,9 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 (cd /usr/X11R6/lib/X11/fonts/misc; /usr/X11R6/bin/mkfontdir)
 
 %files
-%defattr(-,root,root)
+%defattr(644,root,root,755)
 %doc README README.Linux
-%attr(4755,games,games)        /usr/X11R6/bin/xhextris
-/usr/X11R6/lib/X11/fonts/misc/hex20.pcf
+%attr(4755,games,games) %{_bindir}/xhextris
+%{_prefix}/X11R6/lib/X11/fonts/misc/hex20.pcf
 %attr(-,games,games)   /var/lib/games/xhextris-scores
-/etc/X11/wmconfig/cxhextris
+%{_sysconfdir}/X11/wmconfig/cxhextris