SPECS: vkeybd.spec - real xorg BRs - dropped lib64 patch, pass XLIB instead...

[qboosh]

Author: qboosh                       Date: Wed Feb 18 17:25:53 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- real xorg BRs
- dropped lib64 patch, pass XLIB instead
- use optflags
- more verbose files

---- Files affected:
SPECS:
   vkeybd.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/vkeybd.spec
diff -u SPECS/vkeybd.spec:1.18 SPECS/vkeybd.spec:1.19
--- SPECS/vkeybd.spec:1.18	Sun Jan 18 10:41:36 2009
+++ SPECS/vkeybd.spec	Wed Feb 18 18:25:47 2009
@@ -15,12 +15,11 @@
 Source1:	%{name}rc
 Source2:	%{name}.desktop
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-lib64.patch
 URL:		http://www.alsa-project.org/~tiwai/alsa.html
-BuildRequires:	xorg-xserver-server-devel
 BuildRequires:	alsa-lib-devel
 %{?with_ladcca:BuildRequires:	ladcca-devel >= 0.4.0}
 BuildRequires:	tk-devel
+BuildRequires:	xorg-lib-libX11-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,12 +33,14 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%if "%{_lib}" == "lib64"
-%patch1 -p1
-%endif
 
 %build
-%{__make} %{?with_ladcca:USE_LADCCA=1}
+%{__make} \
+	CC="%{__cc}" \
+	COPTFLAGS="%{rpmcflags} -Wall" \
+	XLIB="-lX11" \
+	XINC= \
+	%{?with_ladcca:USE_LADCCA=1}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,11 +59,12 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man?/*
+%attr(755,root,root) %{_bindir}/sftovkb
+%attr(755,root,root) %{_bindir}/vkeybd
+%{_mandir}/man1/vkeybd.1*
 %{_datadir}/vkeybd
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_desktopdir}/vkeybd.desktop
+%{_pixmapsdir}/vkeybd.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -70,6 +72,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2009/02/18 17:25:47  qboosh
+- real xorg BRs
+- dropped lib64 patch, pass XLIB instead
+- use optflags
+- more verbose files
+
 Revision 1.18  2009/01/18 09:41:36  duddits
 - up to 0.1.18b
 - BR: xorg-xserver-server-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/vkeybd.spec?r1=1.18&r2=1.19&f=u