rpms/kernel-module-thinkpad/devel kernel-module-thinkpad-console.perms, NONE, 1.1 kernel-module-thinkpad.modules, NONE, 1.1 kernel-module-thinkpad.spec, 1.7, 1.8 kernel-module-thinkpad-README.Fedora, 1.1, NONE

Sat Jul 2 11:28:50 UTC 2005

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18387

Modified Files:
	kernel-module-thinkpad.spec 
Added Files:
	kernel-module-thinkpad-console.perms 
	kernel-module-thinkpad.modules 
Removed Files:
	kernel-module-thinkpad-README.Fedora 
Log Message:
Update according to recent kernel module discussions and new cool stuff in FC4+

--- NEW FILE kernel-module-thinkpad-console.perms ---
# console.perms definitions for ThinkPad devices, http://tpctl.sourceforge.net/

<console>  0600 /dev/thinkpad 0600 root


--- NEW FILE kernel-module-thinkpad.modules ---
#!/bin/sh

# Script for loading ThinkPad modules at boot time.

modprobe thinkpad >/dev/null 2>&1


Index: kernel-module-thinkpad.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel-module-thinkpad/devel/kernel-module-thinkpad.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel-module-thinkpad.spec	2 Apr 2005 18:01:09 -0000	1.7
+++ kernel-module-thinkpad.spec	2 Jul 2005 11:28:48 -0000	1.8
@@ -1,48 +1,39 @@
-%{!?kernel: %define kernel %(uname -r)}
-%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu}
+%{!?kver: %define kver %(uname -r)}
+
+%define ksrc    %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+%define moddir  /lib/modules/%{kver}/updates
 
 Name:           kernel-module-thinkpad
 Version:        5.8
-Release:        1
-Summary:        IBM ThinkPad support kernel modules
+Release:        2.%(echo %{kver} | tr - _)
+Summary:        Supplemental kernel modules for ThinkPadÂ® laptop computers
 
 License:        GPL
 Group:          System Environment/Kernel
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
-Source1:        %{name}-README.Fedora
+Source1:        %{name}-console.perms
+Source2:        %{name}.modules
 Patch0:         %{name}-percpu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  i586 i686
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kernel}
-
-%description
-IBM ThinkPad support kernel modules.
-The following rpmbuild options can be used to build this package
-for a specific kernel:
---define "kernel <uname -r>"
-  Specify the `uname -r` string of the target kernel, for example:
-  "kernel 2.6.6-1.435.2.3".  The default is `uname -r` for the running kernel.
---target <arch>
-  Build for the given architecture instead of the default.
-
-%package        %{kernel}
-Summary:        %{summary}
-Group:          System Environment/Kernel
-Provides:       kernel-module
-Provides:       %{name} = %{version}-%{release}
-Obsoletes:      kernel-mod-thinkpad
-Requires(pre):  %{_sbindir}/groupadd
+BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
+Requires:       kernel-%{_target_cpu} = %{kver}
+Requires:       pam >= 0.79-8
+Requires:       initscripts >= 8.08-1
 Requires(post): /sbin/depmod
 Requires(postun): /sbin/depmod
-Requires:       kernel-%{_target_cpu} = %{kernel}
+Provides:       kernel-modules
+
+%description
+This package contains kernel modules that interface the System
+Management Application Program Interface (SMAPI) BIOS found in some
+ThinkPadÂ® laptop computers, and drivers for certain ThinkPad hardware
+components.
 
-%description    %{kernel}
-IBM ThinkPad support kernel modules, built for kernel
-%{kernel} (%{_target_cpu}).  See
-%{_docdir}/%{name}-%{kernel}-%{version}/README.Fedora
-for post-installation configuration instructions.
+ThinkPad is a registered trademark of Lenovo in the United States,
+other countries, or both.
 
 
 %prep
@@ -53,15 +44,18 @@
 
 
 %build
-make %{?_smp_mflags} -C 2.6/drivers KVER=%{kernel} KSRC=%{ksrc} V=1
+make %{?_smp_mflags} -C 2.6/drivers KVER=%{kver} KSRC=%{ksrc} V=1
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad
+install -Dpm 644 %{SOURCE1} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/90-thinkpad.perms
+install -Dpm 755 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/thinkpad.modules
+install -dm 755 $RPM_BUILD_ROOT%{moddir}/thinkpad
 # 744 to allow stripping, will be reset in %%files
-install -pm 744 2.6/drivers/*.ko \
-  $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/thinkpad
+install -pm 744 2.6/drivers/*.ko $RPM_BUILD_ROOT%{moddir}/thinkpad
 install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4
 
 
@@ -69,30 +63,38 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post %{kernel}
-/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+%post
+[ $1 -eq 1 ] && \
+/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
-%postun %{kernel}
-/sbin/depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+%postun
+/sbin/depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
-%files %{kernel}
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* SUPPORTED-MODELS TECHNOTES
-%dir /lib/modules/%{kernel}/updates
-%dir /lib/modules/%{kernel}/updates/thinkpad
-%attr(644,root,root) /lib/modules/%{kernel}/updates/thinkpad/*.ko
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms
+%{_sysconfdir}/sysconfig/modules/thinkpad.modules
+%dir %{moddir}
+%dir %{moddir}/thinkpad
+%attr(644,root,root) %{moddir}/thinkpad/*.ko
 %{_mandir}/man4/thinkpad.4*
 
 
 %changelog
+* Fri Jul  1 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 5.8-2
+- Change towards new (in-progress) kernel module packaging guidelines.
+- Automatically load modules at boot time.
+- Add console.perms.d snippet, drop obsolete README.Fedora.
+
 * Sat Apr  2 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 5.8-1
 - Adjust for FC4 kernel-devel.
 - Drop console.perms munging, document it in README.Fedora instead.
 
 * Sat Jan  8 2005 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
 - Patch to work with kernel 2.6.10.
-- Drop udev stuff and thinkpad group, intruduce console.perms munging.
+- Drop udev stuff and thinkpad group, introduce console.perms munging.
 
 * Sun Dec  5 2004 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
 - Drop support for kernels < 2.6, require udev, clean up specfile.


--- kernel-module-thinkpad-README.Fedora DELETED ---


