SPECS: xrn.spec - don't use /usr/X11R6/{bin, man} (Ac-compatible fo...

[qboosh]

Author: qboosh                       Date: Fri May 19 13:07:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't use /usr/X11R6/{bin,man} (Ac-compatible for a while)

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

---- Diffs:

================================================================
Index: SPECS/xrn.spec
diff -u SPECS/xrn.spec:1.23 SPECS/xrn.spec:1.24
--- SPECS/xrn.spec:1.23	Sat May 13 20:42:08 2006
+++ SPECS/xrn.spec	Fri May 19 15:06:55 2006
@@ -36,9 +36,7 @@
 BuildRequires:	flex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_xbindir	/usr/X11R6/bin
 %define	 	_appdefsdir	/usr/X11R6/lib/X11/app-defaults
-%define		_mandir		/usr/X11R6/man
 
 %description
 A simple Usenet News reader for the X Window System. xrn allows you to
@@ -92,7 +90,8 @@
 
 %build
 xmkmf -a
-%{__make} CXXDEBUGFLAGS="%{rpmcflags}" \
+%{__make} \
+	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags}"
 
 %install
@@ -100,7 +99,9 @@
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install install.man \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	BINDIR=%{_bindir} \
+	MANDIR=%{_mandir}/man1
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/xrn.desktop
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/xrn.png
@@ -111,8 +112,8 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT COMMON-PROBLMS README README.Linux TODO ChangeLog
-%attr(755,root,root) %{_xbindir}/xrn
-%config %{_appdefsdir}/XRn
+%attr(755,root,root) %{_bindir}/xrn
+%{_appdefsdir}/XRn
 %{_desktopdir}/xrn.desktop
 %{_pixmapsdir}/xrn.png
 %{_mandir}/man1/*
@@ -123,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/05/19 13:06:55  qboosh
+- don't use /usr/X11R6/{bin,man} (Ac-compatible for a while)
+
 Revision 1.23  2006/05/13 18:42:08  darekr
 - BR: bison, flex
 - fix build, kill _applnkdir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xrn.spec?r1=1.23&r2=1.24&f=u