rpms/lirc-kmod/devel kmodtool,1.4,1.5 lirc-kmod.spec,1.6,1.7

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11772/devel

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-6
- 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/lirc-kmod/devel/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	24 Mar 2006 21:17:39 -0000	1.4
+++ kmodtool	27 Apr 2006 16:47:45 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.6"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,7 +67,7 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
+Provides:         kernel-modules = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lirc-kmod.spec	17 Mar 2006 07:28:47 -0000	1.6
+++ lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
@@ -5,29 +5,25 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
-%ifnarch i686 x86_64 ppc
-%define kvariants ""
-%else
-%ifarch i686
-%define kvariants "" smp xen0 xenU
-%endif
-%ifarch x86_64
-%define kvariants "" xen0 xenU
-%endif
-%ifarch ppc
-%define kvariants "" smp
+%{?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 ppc
+%define smpvar smp
 %endif
+%ifarch i686 x86_64
+%define xenvar xen0 xenU
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name lirc
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -49,14 +45,9 @@
 computer with a remote control.  This package contains additional
 kernel modules to support additional remote control units.
 
-# 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 -c -T -a 0
 cd lirc-%{version}*
 %patch0 -p0
@@ -116,6 +107,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-6
+- 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.
+
 * Fri Mar 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-5
 - Drop the ppc64* experiment.