rpms/cman-kernel/FC-5 cman-kernel-2.6.15-utsrelease.patch, 1.1, 1.2 cman-kernel.spec, 1.182, 1.183

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Dec 8 23:02:40 UTC 2006


Author: cfeist

Update of /cvs/dist/rpms/cman-kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv18361

Modified Files:
	cman-kernel-2.6.15-utsrelease.patch cman-kernel.spec 
Log Message:
Updated uts release workaround.

cman-kernel-2.6.15-utsrelease.patch:
 configure |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

Index: cman-kernel-2.6.15-utsrelease.patch
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel-2.6.15-utsrelease.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cman-kernel-2.6.15-utsrelease.patch	8 Dec 2006 22:49:49 -0000	1.1
+++ cman-kernel-2.6.15-utsrelease.patch	8 Dec 2006 23:02:34 -0000	1.2
@@ -1,6 +1,6 @@
---- cman-kernel-2.6.15-0/configure.utsrelease	2006-12-08 16:43:18.000000000 -0600
-+++ cman-kernel-2.6.15-0/configure	2006-12-08 16:44:49.000000000 -0600
-@@ -92,14 +92,17 @@ open OFILE, ">make/defines.mk" or die "C
+--- cman-kernel-2.6.15-0/configure.utsrelease	2006-02-21 15:54:54.000000000 -0600
++++ cman-kernel-2.6.15-0/configure	2006-12-08 17:01:57.000000000 -0600
+@@ -92,14 +92,19 @@ open OFILE, ">make/defines.mk" or die "C
  
  print OFILE "# This file was generated by configure from defines.mk.input\n";
  
@@ -22,6 +22,8 @@
 +#}
 +
 +$kernel_version = $kernel_src;
++$kernel_version =~ s/\/lib\/modules\///;
++$kernel_version =~ s/\/build//;
 +$module_dir = "${prefix}/lib/modules/$kernel_version/kernel";
  
  while (<IFILE>) {


Index: cman-kernel.spec
===================================================================
RCS file: /cvs/dist/rpms/cman-kernel/FC-5/cman-kernel.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- cman-kernel.spec	8 Dec 2006 22:49:49 -0000	1.182
+++ cman-kernel.spec	8 Dec 2006 23:02:34 -0000	1.183
@@ -26,7 +26,7 @@
 
 Name: cman-kernel
 Version: 2.6.15.1
-Release: 0.FC5.37
+Release: 0.FC5.38
 License: GPL
 Group: System Environment/Kernel
 Summary: cman-kernel - The Cluster Manager kernel modules




More information about the fedora-cvs-commits mailing list