SPECS: kernel-extra-go7007.spec - revised kernel/userspace split -...

[qboosh]

Author: qboosh                       Date: Tue Aug 30 17:37:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revised kernel/userspace split
- R: -firmware in both versions of modules

---- Files affected:
SPECS:
   kernel-extra-go7007.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/kernel-extra-go7007.spec
diff -u SPECS/kernel-extra-go7007.spec:1.2 SPECS/kernel-extra-go7007.spec:1.3
--- SPECS/kernel-extra-go7007.spec:1.2	Tue Aug 30 02:13:05 2005
+++ SPECS/kernel-extra-go7007.spec	Tue Aug 30 19:37:02 2005
@@ -2,6 +2,7 @@
 #
 # TODO:
 # - make licensing clear (especially for the firware)
+# - optflags for apps
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
@@ -15,7 +16,7 @@
 %endif
 
 Summary:	Exemplary userspace program for go7007 video capture cards
-Summary(pl):	Przykładowy program dla kart przechwytywania video go7007
+Summary(pl):	Przykładowy program dla kart przechwytywania obrazu go7007
 Name:		go7007
 Version:	0.9.6
 %define		_rel	1
@@ -38,7 +39,7 @@
 Exemplary userspace program for go7007 video capture cards.
 
 %description -l pl
-Przykładowy program dla kart przechwytywania video go7007.
+Przykładowy program dla kart przechwytywania obrazu go7007.
 
 %package devel
 Summary:	Header files for the go7007 driver
@@ -76,6 +77,7 @@
 %requires_releq_kernel_up
 Requires(postun):	%releq_kernel_up
 %endif
+Requires:	go7007-firmware
 
 %description -n kernel-extra-go7007
 This is driver for go7007 for Linux.
@@ -93,12 +95,12 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
-Requires:	go7007-firmware
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
 %requires_releq_kernel_smp
 Requires(postun):	%releq_kernel_smp
 %endif
+Requires:	go7007-firmware
 
 %description -n kernel-smp-extra-go7007
 This is driver for go7007 for Linux.
@@ -116,11 +118,11 @@
 %patch1 -p1
 
 %build
-
+%if %{with userspace}
 sed 's, at FIRMWARE_DIR@,/lib/firmware,' < hotplug/wis-ezusb.in > hotplug/wis-ezusb
 
-%if %{with userspace}
-make -C apps CFLAGS="-I../include"
+%{__make} -C apps \
+	CFLAGS="-I../include"
 %endif
 
 %if %{with kernel}
@@ -154,7 +156,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/lib/firmware/{,ezusb}
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT/lib/firmware/ezusb
 install -p firmware/*.bin $RPM_BUILD_ROOT/lib/firmware
 install -p firmware/ezusb/*.hex $RPM_BUILD_ROOT/lib/firmware/ezusb
 
@@ -162,15 +165,14 @@
 install hotplug/wis-ezusb $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/wis-ezusb
 install hotplug/wis.usermap-ezusb $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/wis.usermap
 
-%if %{with userspace}
 install -d $RPM_BUILD_ROOT/usr/bin
 install apps/gorecord $RPM_BUILD_ROOT/usr/bin
-%endif
 
-%if %{with kernel}
 install -d $RPM_BUILD_ROOT%{_includedir}/linux
 install include/*.h $RPM_BUILD_ROOT%{_includedir}/linux
+%endif
 
+%if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/extra
 cp kernel/ko-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/*.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/extra
@@ -211,7 +213,6 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gorecord
-%endif
 
 %files devel
 %defattr(644,root,root,755)
@@ -222,6 +223,7 @@
 /lib/firmware/*
 %attr(755,root,root) %{_sysconfdir}/hotplug/usb/wis-ezusb
 %{_sysconfdir}/hotplug/usb/wis.usermap
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -229,6 +231,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/08/30 17:37:02  qboosh
+- revised kernel/userspace split
+- R: -firmware in both versions of modules
+
 Revision 1.2  2005/08/30 00:13:05  jpc
 - works (it was my kernel which was totally messed)
 - add a patch for gorecord which:
================================================================

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