SPECS: xbill.spec - updated FHS patch, moved to /usr - updated c++...

[qboosh]

Author: qboosh                       Date: Mon Oct 16 21:47:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated FHS patch, moved to /usr
- updated c++ patch for recent gcc
- switched to modular xorg
- release 21

---- Files affected:
SPECS:
   xbill.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/xbill.spec
diff -u SPECS/xbill.spec:1.29 SPECS/xbill.spec:1.30
--- SPECS/xbill.spec:1.29	Sat Jan 21 01:01:17 2006
+++ SPECS/xbill.spec	Mon Oct 16 23:47:40 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Powstrzymaj Billa przed instalowaniem jego systemu na wszystkich komputerach
 Name:		xbill
 Version:	2.0
-Release:	20
+Release:	21
 License:	MIT
 Group:		X11/Applications/Games
 Source0:	ftp://ftp.x.org/contrib/games/%{name}-%{version}.tgz
@@ -13,13 +13,13 @@
 Patch0:		%{name}-c++.patch
 Patch1:		%{name}-imake.patch
 Patch2:		%{name}-FHS.patch
-BuildRequires:	XFree86-devel
 BuildRequires:	libstdc++-devel
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-util-imake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
-
 %description
 The xbill game tests your reflexes as you seek out and destroy all
 forms of Bill, establish new operating systems and boldly go where no
@@ -52,6 +52,8 @@
 
 %{__make} install install.man \
 	DESTDIR=$RPM_BUILD_ROOT \
+	BINDIR=%{_bindir} \
+	MANPATH=%{_mandir} \
 	XBILL_DIR=%{_datadir}/xbill/
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -66,7 +68,7 @@
 %attr(2755,root,games) %{_bindir}/xbill
 %attr(775,root,games) %dir /var/games/xbill
 %attr(664,root,games) %config(noreplace) %verify(not md5 mtime size) /var/games/xbill/scores
-%{_mandir}/man1/*
+%{_mandir}/man1/xbill.1*
 %{_datadir}/xbill
 %{_desktopdir}/xbill.desktop
 %{_pixmapsdir}/*
@@ -77,6 +79,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2006/10/16 21:47:40  qboosh
+- updated FHS patch, moved to /usr
+- updated c++ patch for recent gcc
+- switched to modular xorg
+- release 21
+
 Revision 1.29  2006/01/21 00:01:17  arekm
 - kill Icon: field (support for these is obsolete says jbj)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xbill.spec?r1=1.29&r2=1.30&f=u