- ac-2.52 ready (BuildRequires: autoconf)

- made scores work (sgid games binary, changed score dir perms)
- FHS 2.1/2.2: /var/lib/games/xbl moved to /var/games/xbl
- release 7

Changed files:
    xbl-config.patch -> 1.2
    xbl.spec -> 1.2

diff --git a/xbl-config.patch b/xbl-config.patch
index ecca81bf416a1db4235884e01b681028b56c9111..7754d09e757e314cc2358e2acb0df21507301a48 100644 (file)
--- a/xbl-config.patch
+++ b/xbl-config.patch
@@ -48,7 +48,7 @@
  # If xbl must NOT run with SGID bit (for protect scores files) then
  # comment next line
 -USE_SETGID=-DUSE_SETGID
-+# USE_SETGID=-DUSE_SETGID
++USE_SETGID=-DUSE_SETGID
  
  # group owner of games file
 -GROUP_GID=2
@@ -88,7 +88,7 @@
  #
 -SCOREDIR=/usr/local/lib/xbl
 -@SCOREDIR@
-+SCOREDIR=$(DESTDIR)/var/lib/games/xbl
++SCOREDIR=$(DESTDIR)/var/games/xbl
  
  # Directory where put man pages.
  # The default value if overrided by configure if xmkmf or imake exists.

diff --git a/xbl.spec b/xbl.spec
index 11060e8e5e821c44dbde09eab9912d9565ec2be8..193e117385ffff9b0333765341bcbee621ea386e 100644 (file)
--- a/xbl.spec
+++ b/xbl.spec
@@ -1,44 +1,55 @@
-Summary:       3d geometry game 
-Summary(pl):   Trójwymiarowa gra na zasadach tetrisa.
+Summary:       3D geometry game
+Summary(pl):   Trójwymiarowa gra na zasadach tetrisa
 Name:          xbl
 Version:       1.0j
-Release:       6
+Release:       7
 License:       GPL
-Group:         Applications/Games
-Group(de):     Applikationen/Spiele
-Group(pl):     Aplikacje/Gry
+Group:         X11/Applications/Games
+Group(de):     X11/Applikationen/Spiele
+Group(pl):     X11/Aplikacje/Gry
 Source0:       ftp://ftp710.univ-lyon1.fr/pub/xbl/%{name}-%{version}.tar.Z
 Source1:       %{name}.desktop
 Patch0:                %{name}-config.patch
-Url:           http://www710.univ-lyon1.fr/ftp/xbl/xbl.html
+URL:           http://www710.univ-lyon1.fr/ftp/xbl/xbl.html
+BuildRequires: autoconf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+
 %description
 A three dimensional version of a popular arcade game.
 
+%description -l pl
+Trójwymiarowa wersja popularnej gry.
+
 %prep
 %setup -q
-%patch -p1 -b .config
+%patch -p1
 
 %build
+autoconf
 %configure
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Games
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
 
+gzip -9nf README xbl-README
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README
-%attr(0755,root,root) %{_prefix}/X11R6/bin/xbl
-%config %{_prefix}/X11R6/lib/X11/app-defaults/*
-%{_prefix}/X11R6/man/man?/xbl.6*
-%dir /var/lib/games/xbl
-%config %{_applnkdir}/Games/xbl.desktop
+%doc *.gz
+%attr(2755,root,games) %{_bindir}/xbl
+%config %{_libdir}/X11/app-defaults/*
+%{_mandir}/man6/xbl.6*
+%{_applnkdir}/Games/xbl.desktop
+# score files are owner by first player - so don't allow him to modify...
+%attr(770,root,games) %dir /var/games/xbl