- up to last sources (0.4), apparently only for ancient kernelsHEADmaster

1 files changed, 10 insertions, 79 deletions

diff --git a/kernel-net-fsam7440.spec b/kernel-net-fsam7440.spec
index 4c192b8..76ad103 100644
--- a/kernel-net-fsam7440.spec
+++ b/kernel-net-fsam7440.spec
@@ -1,7 +1,5 @@
 #
 # Conditional build:
-%bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		modname	fsam7440
@@ -9,12 +7,12 @@
 Summary:	Linux kernel module for Wireless switch on AMILO M 7440
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla przełączników bezprzewodowych w AMILO M 7440
 Name:		kernel%{_alt_kernel}-net-%{modname}
-Version:	0.3
+Version:	0.4
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/fsam7440/fsam7440-%{version}.tar.bz2
-# Source0-md5:	6bd6f8c82c3bc52bab33e5099904d0f4
+Source0:	https://downloads.sourceforge.net/fsam7440/fsam7440-%{version}.tar.bz2
+# Source0-md5:	d7567212acb5aca03b7926bbfcf67721
 URL:		http://fsam7440.sourceforge.net/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
 BuildRequires:	rpmbuild(macros) >= 1.308
@@ -22,8 +20,11 @@ BuildRequires:	sed >= 4.0
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
+Obsoletes:	kernel%{_alt_kernel}-smp-net-%{modname} < 0.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_enable_debug_packages	0
+
 %description -n kernel%{_alt_kernel}-net-%{modname}
 Linux kernel module to change wireless radio status on Fujitsu-Siemens
 AMILO M 7440 laptop.
@@ -32,74 +33,18 @@ AMILO M 7440 laptop.
 Moduł jądra Linuksa do zmiany stanu radia bezprzewodowego w laptopach
 Fujitsu-Siemens AMILO M 7440.
 
-%package -n kernel%{_alt_kernel}-smp-net-%{modname}
-Summary:	Linux SMP kernel module for Wireless switch on AMILO M 7440
-Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla przełączników bezprzewodowych w AMILO M 7440
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Requires:	module-init-tools >= 3.2.2-2
-
-%description -n kernel%{_alt_kernel}-smp-net-%{modname}
-Linux SMP kernel module to change wireless radio status on
-Fujitsu-Siemens AMILO M 7440 laptop.
-
-%description -n kernel%{_alt_kernel}-smp-net-%{modname} -l pl.UTF-8
-Moduł jądra Linuksa SMP do zmiany stanu radia bezprzewodowego w
-laptopach Fujitsu-Siemens AMILO M 7440.
-
 %prep
 %setup -q -n %{modname}-%{version}
 
+%{__sed} -i -e 's,linux/autoconf\.h,generated/autoconf.h,' fsam7440.c
+
 %build
-# kernel module(s)
-rm -rf built
-mkdir -p built/{nondist,smp,up}
-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" \
-		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 *.ko built/$cfg
-done
+%build_kernel_modules -m fsam7440
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc \
-	$RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}{,smp} \
-	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/net
-
-cd built
-install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/fsam7440.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fsam7440.ko
 
-%if %{with smp} && %{with dist_kernel}
-install smp/fsam7440.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fsam7440.ko
-%endif
+%install_kernel_modules -m fsam7440 -d misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,22 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun	-n kernel%{_alt_kernel}-net-%{modname}
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-%{modname}
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-net-%{modname}
-%depmod %{_kernel_ver}smp
-
 %files -n kernel%{_alt_kernel}-net-%{modname}
 %defattr(644,root,root,755)
 %doc README AUTHORS
 %doc %lang(es) README-ES
 /lib/modules/%{_kernel_ver}/misc/fsam7440*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-%{modname}
-%defattr(644,root,root,755)
-%doc README AUTHORS
-%doc %lang(es) README-ES
-/lib/modules/%{_kernel_ver}smp/misc/fsam7440*.ko*
-%endif