X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acerhk.spec;h=a6e5b4ff305f3d2e25803a6637061f901990649d;hb=187e3c661602be211f3fb4f73cf8f9ed97ec125b;hp=edc14dbc8e6e447f1f3d92af346ad7737ded5504;hpb=9526332f6b7491bac3a004dedb9e988ca9fa195a;p=packages%2Facerhk.git

diff --git a/acerhk.spec b/acerhk.spec
index edc14db..a6e5b4f 100644
--- a/acerhk.spec
+++ b/acerhk.spec
@@ -1,81 +1,47 @@
+#
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
-%bcond_without	smp		# don't build SMP module
-
-%define _rel		1
+#
+%define _rel		3
 %define _orig_name	acerhk
 
-Summary:	Driver for a special Acer Hot Keys.
-Summary(pl):	Sterownik obsluguj±cy specjalne klawisze w notebookach Acer.
+Summary:	Linux driver for Acer notebook special Hot Keys
+Summary(pl.UTF-8):	Sterownik dla Linuksa obsługujący specjalne klawisze w notebookach Acer
 Name:		kernel-misc-%{_orig_name}
-Version:	0.5.18
+Version:	0.5.35
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://www.informatik.hu-berlin.de/~tauber/acerhk/archives/%{_orig_name}-%{version}.tgz
-# Source0-md5:	2627c1760a1d8e22ad4d4519475cf0c6
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.0}
+Source0:	http://www.cakey.de/acerhk/archives/%{_orig_name}-%{version}.tar.bz2
+# Source0-md5:	551285657c8ba338f23595af257d21df
+URL:		http://www.cakey.de/acerhk/
 BuildRequires:	%{kgcc_package}
-BuildRequires:	rpmbuild(macros) >= 1.118
-URL:		http://www.informatik.hu-berlin.de/~tauber/acerhk/
-%{?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}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
-This is a driver for a special Acer Hot Keys.
-
-%description -l pl
-Sterownik pozwalaj±cy uaktywniæ specjalne przyciski w notebookach Acer.
-
-%description -n kernel-misc-%{_orig_name}
-This is a driver for a special Acer Hot Keys.
+%define	modules	acerhk
 
-%description -n kernel-misc-%{_orig_name} -l pl
-Sterownik pozwalaj±cy uaktywniæ specjalne przyciski w notebookach Acer.
-
-%package -n kernel-smp-misc-%{_orig_name}
-Summary:	This is a driver for a special Acer Hot Keys.
-Summary(pl):	Sterownik pozwalaj±cy uaktywniæ specjalne przyciski 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}
-This is a driver for a special Acer Hot Keys.
+%description
+This is a Linux driver for Acer notebook special Hot Keys.
 
-%description -n kernel-smp-misc-%{_orig_name} -l pl
-Sterownik pozwalaj±cy uaktywniæ specjalne przyciski w notebookach Acer.
+%description -l pl.UTF-8
+Sterownik dla Linuksa pozwalający uaktywnić specjalne przyciski w
+notebookach Acer.
 
 %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
-    rm -rf include
-    install -d include/{linux,config}
-    ln -sf %{_kernelsrcdir}/config-$cfg .config
-    ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-    touch include/config/MARKER
-    %{__make} -C %{_kernelsrcdir} clean modules \
-    EXTRA_CFLAGS="-I../include -DFUSE_VERSION='1.1'" \
-    RCS_FIND_IGNORE="-name '*.ko' -o" \
-    M=$PWD O=$PWD \
-    %{?with_verbose:V=1}
-    mv %{_orig_name}.ko %{_orig_name}-$cfg.ko
-done
+%build_kernel_modules -m %{modules}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install %{_orig_name}-up.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.ko
-install %{_orig_name}-smp.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/%{_orig_name}.ko
+%install_kernel_modules -m %{modules} -d misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,18 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 %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 -n kernel-misc-%{_orig_name}
+%files
 %defattr(644,root,root,755)
 %doc NEWS INSTALL README doc/*
 /lib/modules/%{_kernel_ver}/misc/*.ko*
-
-%files -n kernel-smp-misc-%{_orig_name}
-%defattr(644,root,root,755)
-%doc NEWS INSTALL README doc/*
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*