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

[Ville Skytta (scop)]

Author: scop

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

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


Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmodtool	27 Apr 2006 16:47:45 -0000	1.5
+++ kmodtool	15 May 2006 19:48:28 -0000	1.6
@@ -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: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
+++ lirc-kmod.spec	15 May 2006 19:48:28 -0000	1.8
@@ -5,7 +5,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)
@@ -23,7 +23,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        6.%(echo %{kverrel} | tr - _)
+Release:        7.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -107,6 +107,10 @@
 
 
 %changelog
+* Mon May 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-7
+- Require version >= of lirc-kmod-common.
+- Provide lirc-kmod instead of kmod-lirc to fix upgrade problems.
+
 * 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.