SPECS: linux-gpib.spec - compile and install OK - %%files requires...

[cieciwa]

Author: cieciwa                      Date: Wed Jun 29 11:33:46 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- compile and install OK
- %%files requires fill.

---- Files affected:
SPECS:
   linux-gpib.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/linux-gpib.spec
diff -u SPECS/linux-gpib.spec:1.4 SPECS/linux-gpib.spec:1.5
--- SPECS/linux-gpib.spec:1.4	Wed Jun 29 13:11:08 2005
+++ SPECS/linux-gpib.spec	Wed Jun 29 13:33:40 2005
@@ -27,7 +27,7 @@
 # Source0-md5:	65044161fe86a815c9c159fe301d85c4
 #Source1:	-
 # Source1-md5:	-
-#Patch0:		%{name}-what.patch
+Patch0:		%{name}-Makefile.am.patch
 URL:		http://linux-gpib.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
@@ -96,6 +96,7 @@
 %prep
 
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal} -I m4
@@ -111,16 +112,15 @@
 	--disable-tcl-binding \
 	--disable-documentation
 
-##%{__make}	
 %if %{with userspace}
-
+%{__make}
 
 %endif
 
+%if %{with kernel}
 cd driver
 for i in agilent_82350b agilent_82357a cb7210 hp82335 hp_82341 nec7210 tms9914 tnt4882 cec ines pc2 sys; do
 cd $i
-%if %{with kernel}
 # kernel module(s)
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
@@ -162,18 +162,23 @@
 	
 	mv $i{,-$cfg}.ko
 done
-%endif 
 cd ..
 done
+%endif 
 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb
+USB_FIRMWARE_DIR=/usr/share/usb/
 
+install -d $RPM_BUILD_ROOT{$HOTPLUG_USB_CONF_DIR,$USB_FIRMWARE_DIR}
 %if %{with userspace}
-
-
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	HOTPLUG_USB_CONF_DIR=$RPM_BUILD_ROOT$HOTPLUG_USB_CONF_DIR \
+	USB_FIRMWARE_DIR=$RPM_BUILD_ROOT$USB_FIRMWARE_DIR
 %endif
 
 %if %{with kernel}
@@ -240,6 +245,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/06/29 11:33:40  cieciwa
+- compile and install OK
+- %%files requires fill.
+
 Revision 1.4  2005/06/29 11:11:08  cieciwa
 - kernel modules compiled and install correctly.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-gpib.spec?r1=1.4&r2=1.5&f=u