SPECS: kernel-misc-acer_acpi.spec - use new kernel macros and kern...

[shadzik]

Author: shadzik                      Date: Fri May  4 00:16:57 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros and kernel module build system
- remove smp stuff

---- Files affected:
SPECS:
   kernel-misc-acer_acpi.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/kernel-misc-acer_acpi.spec
diff -u SPECS/kernel-misc-acer_acpi.spec:1.6 SPECS/kernel-misc-acer_acpi.spec:1.7
--- SPECS/kernel-misc-acer_acpi.spec:1.6	Mon Feb 12 23:09:10 2007
+++ SPECS/kernel-misc-acer_acpi.spec	Fri May  4 02:16:52 2007
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
-%bcond_without	smp		# don't build SMP module
 #
 %define _rel		1
 %define _orig_name	acer_acpi
@@ -18,9 +17,9 @@
 # Source0-md5:	4971a569800757b87041bc542f675743
 URL:		http://www.archernar.co.uk/
 BuildRequires:	%{kgcc_package}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.0}
-BuildRequires:	rpmbuild(macros) >= 1.118
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,67 +32,15 @@
 Moduł jądra Linuksa pozwalający kontrolować część sprzętu w nowszych
 laptopach Acera (i innych Wistron OEM).
 
-%package -n kernel-smp-misc-%{_orig_name}
-Summary:	SMP linux driver for Acer notebook hardware control
-Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kontroli urządzeń w notebookach Acer
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel-smp-misc-%{_orig_name}
-Linux SMP kernel module to allow control of some of the hardware on
-later model Acer (and other Wistron OEM) laptops.
-
-%description -n kernel-smp-misc-%{_orig_name} -l pl.UTF-8
-Moduł jądra Linuksa SMP pozwalający kontrolować część sprzętu w
-nowszych laptopach Acera (i innych Wistron OEM).
-
 %prep
 %setup -q -n %{_orig_name}-%{version}
 
 %build
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%if %{with dist_kernel}
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-	install -d o/include/config
-	touch o/include/config/MARKER
-	ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-
-	mv %{_orig_name}.ko %{_orig_name}-$cfg.ko
-done
+%build_kernel_modules -m %{_orig_name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install %{_orig_name}-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.ko
-%if %{with smp} && %{with dist_kernel}
-install %{_orig_name}-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.ko
-%endif
+%install_kernel_modules -m %{_orig_name} -d misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,30 +51,21 @@
 %postun	-n kernel-misc-%{_orig_name}
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-misc-%{_orig_name}
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel-smp-misc-%{_orig_name}
-%depmod %{_kernel_ver}smp
-
 %files
 %defattr(644,root,root,755)
 %doc NEWS INSTALL README
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
-%if %{with smp}
-%files -n kernel-smp-misc-%{_orig_name}
-%defattr(644,root,root,755)
-%doc NEWS INSTALL README
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/05/04 00:16:52  shadzik
+- use new kernel macros and kernel module build system
+- remove smp stuff
+
 Revision 1.6  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-misc-acer_acpi.spec?r1=1.6&r2=1.7&f=u