rpms/thinkpad-kmod/FC-5 kmodtool, 1.4, 1.5 thinkpad-kmod.spec, 1.8, 1.9

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
Sync with latest kmod doc, fixes some upgrade issues.


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	27 Apr 2006 16:45:40 -0000	1.4
+++ kmodtool	15 May 2006 19:48:21 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.7"
+myver="0.10.9"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -68,9 +68,9 @@
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-modules = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides:         ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- thinkpad-kmod.spec	27 Apr 2006 16:45:40 -0000	1.8
+++ thinkpad-kmod.spec	15 May 2006 19:48:21 -0000	1.9
@@ -3,7 +3,7 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+%{?kversion: %define kversion 2.6.16-1.2111_FC5}
 
 %define kmod_name lirc
 %define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
@@ -19,7 +19,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -65,6 +65,10 @@
 
 
 %changelog
+* Mon May 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 5.9-6
+- Require version >= of thinkpad-kmod-common.
+- Provide thinkpad-kmod instead of kmod-thinkpad to fix upgrade problems.
+
 * 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.