SPECS: hwinfo.spec - kill some insanity (do no package FHS dirs) -...

[glen]

Author: glen                         Date: Wed May 23 18:06:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- kill some insanity (do no package FHS dirs)
- adapterized, cc, cflags

---- Files affected:
SPECS:
   hwinfo.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/hwinfo.spec
diff -u SPECS/hwinfo.spec:1.2 SPECS/hwinfo.spec:1.3
--- SPECS/hwinfo.spec:1.2	Wed May 23 20:04:21 2007
+++ SPECS/hwinfo.spec	Wed May 23 20:06:26 2007
@@ -2,7 +2,11 @@
 #
 # TODO:
 # - polish description
-Summary:	hwinfo is the hardware detection tool used in SuSE Linux.
+# - -devel/static etc?
+# - can't build:
+#In file included from hal.c:19:
+#/usr/include/hal/libhal.h:29:23: dbus/dbus.h: No such file or directory
+Summary:	hwinfo is the hardware detection tool used in SuSE Linux
 Name:		hwinfo
 Version:	13.11
 Release:	0.1
@@ -12,8 +16,8 @@
 # Source0-md5:	afc560ebe9404fcb1553bc9ebda69700
 Patch0:		%{name}-kbd.patch
 URL:		http://packages.qa.debian.org/h/hwinfo.html
-BuildRequires:	hal-devel
 BuildRequires:	dbus-devel
+BuildRequires:	hal-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,7 +28,9 @@
 %patch0 -p0
 
 %build
-%{__make}
+%{__make} -j1 \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -37,11 +43,11 @@
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libhd.so*
-/usr/sbin
-%attr(644,root,root) %{_includedir}
-%attr(644,root,root) %{_libdir}/pkgconfig/hwinfo.pc
-%attr(644,root,root) %{_datadir}/%{name}
+%attr(755,root,root) %{_libdir}/libhd.so*
+%{_datadir}/%{name}
+%attr(755,root,root) %{_sbindir}/*
+%{_includedir}/*
+%{_pkgconfigdir}/hwinfo.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -49,9 +55,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007/05/23 18:06:26  glen
+- kill some insanity (do no package FHS dirs)
+- adapterized, cc, cflags
+
 Revision 1.2  2007/05/23 18:04:21  cactus
 - rpm group fix
 
 Revision 1.1  2007/05/23 17:55:53  cactus
 - initial version
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hwinfo.spec?r1=1.2&r2=1.3&f=u