SPECS: xjewel.spec - moved to /usr, updated .desktop file - switch...

[qboosh]

Author: qboosh                       Date: Tue Oct 17 19:04:48 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved to /usr, updated .desktop file
- switched to modular xorg
- release 21

---- Files affected:
SPECS:
   xjewel.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/xjewel.spec
diff -u SPECS/xjewel.spec:1.23 SPECS/xjewel.spec:1.24
--- SPECS/xjewel.spec:1.23	Sat Jan 21 01:01:17 2006
+++ SPECS/xjewel.spec	Tue Oct 17 21:04:39 2006
@@ -6,7 +6,7 @@
 Summary(tr):	Sega'nýn columns'una benzer oyun
 Name:		xjewel
 Version:	1.6
-Release:	20
+Release:	21
 License:	MIT
 Group:		X11/Applications/Games
 Source0:	ftp://ftp.x.org/R5contrib/%{name}-%{version}.tar.z
@@ -17,12 +17,11 @@
 Patch1:		%{name}-enhance.patch
 Patch2:		%{name}-nobr.patch
 Patch3:		%{name}-select.patch
-BuildRequires:	XFree86-devel
+BuildRequires:	xorg-cf-files
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-util-imake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		/usr/X11R6/man
-
 %description
 Xjewel is an X Window System game much like Domain/Jewelbox, Sega's
 Columns and/or Tetris. The point of the game is to move or rotate the
@@ -66,7 +65,9 @@
 
 %build
 xmkmf
-%{__make} CDEBUGFLAGS="%{rpmcflags}" \
+%{__make} \
+	CC="%{__cc}" \
+	CDEBUGFLAGS="%{rpmcflags}" \
 	HSCORE_FILE=/var/games/xjewel.scores
 
 %install
@@ -75,6 +76,8 @@
 
 %{__make} install install.man \
 	DESTDIR=$RPM_BUILD_ROOT \
+	BINDIR=%{_bindir} \
+	MANDIR=%{_mandir}/man1 \
 	HSCORE_FILE=/var/games/xjewel.scores
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
@@ -98,6 +101,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/10/17 19:04:39  qboosh
+- moved to /usr, updated .desktop file
+- switched to modular xorg
+- release 21
+
 Revision 1.23  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/xjewel.spec?r1=1.23&r2=1.24&f=u