Mimic tp_smapi-kmod as close as possible

2 files changed, 34 insertions, 11 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 9acf7e6..0c1aab3 120000..100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1 +1,8 @@
-git-rpm/GNUmakefile
\ No newline at end of file
+NAME = synaptics-usb-kmod
+dummy := $(shell test -f git-rpm/git-rpm.mk || git submodule update --init)
+include git-rpm/git-rpm.mk
+OPTS += --target i686-linux
+
+akmods: $(SRPM)
+	mkdir -p rpm-dist/akmod
+	akmodsbuild $(AK_OPTS) -o rpm-dist/akmod -v $(SRPM)
diff --git a/synaptics-usb-kmod.spec b/synaptics-usb-kmod.spec
index 8ce9b18..726340a 100644
--- a/synaptics-usb-kmod.spec
+++ b/synaptics-usb-kmod.spec
@@ -1,23 +1,32 @@
 # (un)define the next line to either build for the newest or all current kernels
-#global buildforkernels newest
-%global buildforkernels akmod
+#define buildforkernels newest
+%define buildforkernels akmod
 
-%global         tarbase synaptics-usb
-%global         tarvers 1.5rc4
+%define         tarbase synaptics-usb
+%define         tarvers 1.5rc4
 
 Name:           synaptics-usb-kmod
 Version:        1.5
 Release:        0.1.5rc4%{?dist}
-Summary:        USB Synaptics device driver
+Summary:        USB Synaptics device driver - kernel driver
 
 Group:          System Environment/Kernel
 License:        GPLv2+
 URL:            http://www.jan-steinhoff.de/linux/synaptics-usb.html
 Source0:        http://www.jan-steinhoff.de/linux/%{tarbase}-%{tarvers}.tar.bz2
+Source11:       synaptics-usb-kmodtool-excludekernel-filterfile
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%global         repo rpmfusion
 
+
+
+
+
+
+
+%define         repo rpmfusion
+
+# get the needed BuildRequires (in parts depending on what we build for)
 BuildRequires:  %{_bindir}/kmodtool
 Requires:       akmods
 %{!?kernels:BuildRequires: buildsys-build-%{repo}-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -26,7 +35,7 @@ Requires:       akmods
 
 
 %description
-USB Synaptics device driver.
+USB Synaptics device driver - kernel driver
 
 
 %prep
@@ -37,10 +46,16 @@ kmodtool --target %{_target_cpu} --repo %{repo} --kmodname %{name} --filterfile
 %setup -q -c -T -a 0
 
 for kernel_version in %{?kernel_versions}; do
-    %{__cp} -rl tp_smapi-%{version} _kmod_source_${kernel_version%%___*}
+    %{__cp} -rl synaptics-usb _kmod_source_${kernel_version%%___*}
 done
 
-%global module_list synaptics_usb
+
+
+
+
+
+
+%define module_list synaptics_usb
 
 
 %build
@@ -52,7 +67,7 @@ for kernel_version in %{?kernel_versions}; do
                KVER="${kernel_version%%___*}" \
                KSRC="${kernel_version##*___}" \
                KBUILD="${kernel_version##*___}" \
-               HDAPS=%{with_hdaps} \
+               \
                modules
     for mod in %{module_list}; do
         mv -f "_kmod_source_${kernel_version%%___*}/${mod}.ko" "_kmod_build_${kernel_version%%___*}"
@@ -71,6 +86,7 @@ for kernel_version in %{?kernel_versions}; do
   done
 done
 
+
 %{?akmod_install}