SPECS: osdsh.spec - kill _applnkdir, fix %doc - added -cc patch, p...

[darekr]

Author: darekr                       Date: Tue Apr  8 18:11:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill _applnkdir, fix %doc
- added -cc patch, pass CC, CFLAGS

---- Files affected:
SPECS:
   osdsh.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/osdsh.spec
diff -u SPECS/osdsh.spec:1.11 SPECS/osdsh.spec:1.12
--- SPECS/osdsh.spec:1.11	Tue Feb 13 08:16:51 2007
+++ SPECS/osdsh.spec	Tue Apr  8 20:10:56 2008
@@ -12,6 +12,7 @@
 Source2:	osd_keymapconfig.desktop
 Source3:	osd_tk%{name}config.desktop
 Patch0:		%{name}-DESTDIR.patch
+Patch1:		%{name}-cc.patch
 URL:		http://sourceforge.net/projects/osdsh/
 BuildRequires:	XFree86-devel
 BuildRequires:	apmd-devel
@@ -45,22 +46,29 @@
 %prep
 %setup  -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__make}
+mv data/README data/README.data
+mv HOWTO/README HOWTO/README.howto
+
+%{__make} \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 install tkosdshconfig		$RPM_BUILD_ROOT%{_bindir}
 install HOWTO/keymapconfig	$RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Tools,%{_applnkdir}/Settings}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Tools
-install %{SOURCE2} $RPM_BUILD_ROOT%{_applnkdir}/Settings
-install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Settings
+
+install %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
+
+rm -rf $RPM_BUILD_ROOT/usr/doc
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
@@ -70,10 +78,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README* data/* HOWTO/{*.html,README}
+%doc README* data/* HOWTO/{*.html,README.howto}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*
-%{_applnkdir}/*/*
+%{_desktopdir}/*.desktop
 
 %files devel
 %defattr(644,root,root,755)
@@ -86,7 +94,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.11  2007-02-13 07:16:51  glen
+Revision 1.12  2008-04-08 18:10:56  darekr
+- kill _applnkdir, fix %doc
+- added -cc patch, pass CC, CFLAGS
+
+Revision 1.11  2007/02/13 07:16:51  glen
 - tabs in preamble
 
 Revision 1.10  2007/02/12 00:49:18  baggins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/osdsh.spec?r1=1.11&r2=1.12&f=u