From 7f2c4a12101573fbf9df69e67892ad72d6857bc1 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sun, 12 Apr 2009 15:16:04 +0200
Subject: make "service akmod restart" work

---
 synaptics-usb-kmod-Makefile.patch | 12 ++++++++++++
 synaptics-usb-kmod.spec           | 13 ++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 synaptics-usb-kmod-Makefile.patch

diff --git a/synaptics-usb-kmod-Makefile.patch b/synaptics-usb-kmod-Makefile.patch
new file mode 100644
index 0000000..224578f
--- /dev/null
+++ b/synaptics-usb-kmod-Makefile.patch
@@ -0,0 +1,12 @@
+--- synaptics-usb/Makefile	2009-01-23 17:32:42.000000000 +0100
++++ synaptics-usb/Makefile.fedora	2009-04-12 14:56:30.000000000 +0200
+@@ -10,6 +10,9 @@
+ all:
+ 	$(MAKE) -C $(KSRC) M=`pwd` CPATH=`pwd` modules
+ 
++modules: $(KBUILD)
++	$(MAKE) -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules
++
+ .PHONY: all clean patchfile patch-kernel mrproper install uninstall
+ 
+ patchfile:
diff --git a/synaptics-usb-kmod.spec b/synaptics-usb-kmod.spec
index a816a24..92f9ca7 100644
--- a/synaptics-usb-kmod.spec
+++ b/synaptics-usb-kmod.spec
@@ -7,7 +7,7 @@
 
 Name:           synaptics-usb-kmod
 Version:        1.5
-Release:        3%{?tarvers:.%{tarvers}}%{?dist}
+Release:        4%{?tarvers:.%{tarvers}}%{?dist}
 Summary:        USB Synaptics device driver - kernel driver
 
 Group:          System Environment/Kernel
@@ -15,6 +15,7 @@ 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
+Patch1:         synaptics-usb-kmod-Makefile.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 
@@ -44,6 +45,7 @@ USB Synaptics device driver - kernel driver
 # print kmodtool output for debugging purposes:
 kmodtool --target %{_target_cpu} --repo %{repo} --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
 %setup -q -c -T -a 0
+%patch1 -p0 -b.makefile
 
 for kernel_version in %{?kernel_versions}; do
     %{__cp} -rl synaptics-usb _kmod_source_${kernel_version%%___*}
@@ -61,14 +63,15 @@ done
 %build
 for kernel_version in %{?kernel_versions}; do
     mkdir "_kmod_build_${kernel_version%%___*}"
-    %{__make} -C "_kmod_source_${kernel_version%%___*}" \
+    pushd "_kmod_source_${kernel_version%%___*}"
+    %{__make} \
                V=1 \
                O="_kmod_build_${kernel_version%%___*}" \
                KVER="${kernel_version%%___*}" \
                KSRC="${kernel_version##*___}" \
                KBUILD="${kernel_version##*___}" \
-               \
                modules
+    popd
     for mod in %{module_list}; do
         mv -f "_kmod_source_${kernel_version%%___*}/${mod}.ko" "_kmod_build_${kernel_version%%___*}"
     done
@@ -95,6 +98,10 @@ done
 
 
 %changelog
+* Sun Apr 12 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.5-4.1.5rc4
+- fix building of kernel module via "service akmod restart"
+- first working package
+
 * Sun Apr 12 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.5-3.1.5rc4
 - bump version to stay in sync with synaptics-usb
 
-- 
cgit