rpms/thinkpad-kmod/FC-5 kmodtool, 1.3, 1.4 thinkpad-kmod.spec, 1.7, 1.8

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11722/FC-5

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-5
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	15 Mar 2006 19:52:17 -0000	1.3
+++ kmodtool	27 Apr 2006 16:45:40 -0000	1.4
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.5"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,10 +67,10 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{version}-%{release}
+Provides:         kernel-modules = ${verrel}${variant}
+Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{version}
+Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thinkpad-kmod.spec	15 Mar 2006 20:23:25 -0000	1.7
+++ thinkpad-kmod.spec	27 Apr 2006 16:45:40 -0000	1.8
@@ -3,22 +3,23 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
 %ifarch i686
-%define kvariants "" xen0
-%else
-%define kvariants ""
+%define xenvar xen0
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name thinkpad
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -33,14 +34,9 @@
 %description
 This package provides %{kmod_name} kernel modules.
 
-# magic hidden here:
 %{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}
 
 %prep
-# to understand the magic better or to debug it, uncomment this:
-#%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
-#sleep 5
-
 %setup -q -T -c -a 0
 %patch0 -p0
 sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
@@ -69,6 +65,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-5
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Wed Mar 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-4
 - Drop xenU.