SPECS: kernel-video-qc-usb.spec - version 0.6.5, updated for new m...

[radek]

Author: radek                        Date: Thu Jun  7 10:14:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- version 0.6.5, updated for new macros, builds

---- Files affected:
SPECS:
   kernel-video-qc-usb.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/kernel-video-qc-usb.spec
diff -u SPECS/kernel-video-qc-usb.spec:1.5 SPECS/kernel-video-qc-usb.spec:1.6
--- SPECS/kernel-video-qc-usb.spec:1.5	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-video-qc-usb.spec	Thu Jun  7 12:14:28 2007
@@ -4,31 +4,29 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace utility
 #
-%ifarch sparc
-%undefine with_smp
-%endif
 %define	_rel	1
 Summary:	Kernel module for Logitech QuickCam USB cameras (new)
 Summary(pl.UTF-8):	Moduł jądra do kamer USB Logitech QuickCam (nowy)
 Name:		kernel-video-qc-usb
-Version:	0.6.3
+Version:	0.6.5
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/qce-ga/qc-usb-%{version}.tar.gz
-# Source0-md5:	3d33380a29a7f92c4eef1f82d61b4ee0
+# Source0-md5:	6f6787e1dda11ca3b936ad434154f426
 URL:		http://qce-ga.sourceforge.net/
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel-module-build >= 3:2.6}
+BuildRequires:	kernel-module-build >= 3:2.6
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.118
 %if %{with kernel} && %{with dist_kernel}
-%requires_releq_kernel_up
+%requires_releq_kernel
 %endif
 Requires(post,postun):	/sbin/depmod
+# XXX: ?
+#Obsoletes:	kernel-smp-video-qc-usb
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,22 +35,6 @@
 %description -l pl.UTF-8
 Sterownik do kamer USB Logitech QuickCam (nowy).
 
-%package -n kernel-smp-video-qc-usb
-Summary:	SMP kernel module for Logitech QuickCam USB cameras
-Summary(pl.UTF-8):	Moduł jądra SMP do kamer USB Logitech QuickCam
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%if %{with kernel} && %{with dist_kernel}
-%requires_releq_kernel_smp
-%endif
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel-smp-video-qc-usb
-Logitech QuickCam USB cameras driver for SMP kernel (a new one).
-
-%description -n kernel-smp-video-qc-usb -l pl.UTF-8
-Sterownik do kamer USB Logitech QuickCam dla jądra SMP (nowy).
-
 %package -n qc-usb
 Summary:	Documentation and test program to Logitech QuickCam USB
 Summary(pl.UTF-8):	Dokumentacja i program testujący do kamer Logitech QuickCam USB
@@ -69,18 +51,12 @@
 %setup -q -n qc-usb-%{version}
 
 %build
-%if %{with kernel}
-%if %{with dist_kernel} && %{with smp}
-%{__make} all \
-		CC="%{kgcc}" \
-		INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include"
-mv -f quickcam.ko  quickcam-smp.ko
-#%%{__make} clean
-%endif
-%{__make} all \
-		CC="%{kgcc}" \
-		INCLUDES="%{rpmcflags} -I.  -I%{_kernelsrcdir}/include"
-%endif
+#%%if %{with kernel}
+#%{__make} all \
+#		CC="%{kgcc}" \
+#		INCLUDES="%{rpmcflags} -I. -D__KERNEL_SMP=1 -D__SMP__ -I%{_kernelsrcdir}/include"
+#%%endif
+%build_kernel_modules -m quickcam
 
 %if %{with userspace}
 %{__make} -C testquickcam
@@ -90,12 +66,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with kernel}
-%if %{with dist_kernel} && %{with smp}
-install -D quickcam-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/video/quickcam.ko
-%endif
-install -D quickcam.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/video/quickcam.ko
-%endif
+%install_kernel_modules -m quickcam -d misc
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_sbindir}
@@ -111,28 +82,16 @@
 %postun
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-video-qc-usb
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-video-qc-usb
-%depmod %{_kernel_ver}smp
-
 %if %{with kernel}
 %files
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/video/*
-
-%if %{with dist_kernel} && %{with smp}
-%files -n kernel-smp-video-qc-usb
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/video/*
-%endif
+/lib/modules/%{_kernel_ver}/misc/*
 %endif
 
 %if %{with userspace}
 %files -n qc-usb
 %defattr(644,root,root,755)
-%doc README
+%doc *.txt APPLICATIONS CREDITS FAQ README* TODO
 %attr(755,root,users) %{_sbindir}/testquickcam
 %endif
 
@@ -142,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/06/07 10:14:28  radek
+- version 0.6.5, updated for new macros, builds
+
 Revision 1.5  2007/02/13 08:06:37  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-video-qc-usb.spec?r1=1.5&r2=1.6&f=u