SPECS: xsysinfo.spec - don't use xbindir - pass CC - don't mark ap...

[qboosh]

Author: qboosh                       Date: Tue Sep 13 13:05:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't use xbindir
- pass CC
- don't mark app-defaults in /usr as config

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

---- Diffs:

================================================================
Index: SPECS/xsysinfo.spec
diff -u SPECS/xsysinfo.spec:1.23 SPECS/xsysinfo.spec:1.24
--- SPECS/xsysinfo.spec:1.23	Sun Sep 11 16:47:54 2005
+++ SPECS/xsysinfo.spec	Tue Sep 13 15:05:24 2005
@@ -24,7 +24,6 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 	
 %define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
-%define		_xbindir	/usr/X11R6/bin
 
 %description
 Xsysinfo is a graphic kernel monitoring tool for the X Window System.
@@ -85,7 +84,8 @@
 %{__make} clean
 
 #xmkmf
-%{__make} CXXDEBUGFLAGS="%{rpmcflags}" \
+%{__make} \
+	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags}"
 
 %install
@@ -93,7 +93,8 @@
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	BINDIR=%{_bindir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -105,9 +106,9 @@
 %files
 %defattr(644,root,root,755)
 %doc README CHANGES
-%attr(755,root,root) %{_xbindir}/xsysinfo
-%config %{_appdefsdir}/XSysinfo
-%config %{_appdefsdir}/XSysinfo-color
+%attr(755,root,root) %{_bindir}/xsysinfo
+%{_appdefsdir}/XSysinfo
+%{_appdefsdir}/XSysinfo-color
 %{_desktopdir}/xsysinfo.desktop
 %{_pixmapsdir}/*
 
@@ -117,6 +118,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/09/13 13:05:24  qboosh
+- don't use xbindir
+- pass CC
+- don't mark app-defaults in /usr as config
+
 Revision 1.23  2005/09/11 14:47:54  darekr
 - fix Icon field
 
================================================================

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