rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.15, 1.16 buildsys-build-rpmfusion-list-kernels.sh, 1.4, 1.5 buildsys-build-rpmfusion.spec, 1.20, 1.21

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25990

Modified Files:
	buildsys-build-rpmfusion-kerneldevpkgs-current 
	buildsys-build-rpmfusion-list-kernels.sh 
	buildsys-build-rpmfusion.spec 
Log Message:
try a new way to avoid that this needs updating when new rawhide kenrels come out


Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- buildsys-build-rpmfusion-kerneldevpkgs-current	11 Jan 2009 10:29:06 -0000	1.15
+++ buildsys-build-rpmfusion-kerneldevpkgs-current	15 Jan 2009 17:36:36 -0000	1.16
@@ -1,3 +1,3 @@
-2.6.29-0.25.rc0.git14.fc11
-2.6.29-0.25.rc0.git14.fc11smp
-2.6.29-0.25.rc0.git14.fc11PAE
+default
+defaultsmp
+defaultPAE


Index: buildsys-build-rpmfusion-list-kernels.sh
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-list-kernels.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildsys-build-rpmfusion-list-kernels.sh	2 Oct 2008 21:11:16 -0000	1.4
+++ buildsys-build-rpmfusion-list-kernels.sh	15 Jan 2009 17:36:36 -0000	1.5
@@ -108,7 +108,26 @@
 				fi
 			fi
 		else
-			echo ${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
+			if echo ${this_kernel} | grep -- 'default' &> /dev/null; then
+				# fixme: there are better/reliable ways to get the latest version, but this should do in the 
+				# buildsys, the only place where this normally is used; hardcoding the variants is also not ideal
+				if [[ "${this_kernel_variant}" ]]; then
+					# non-standard-kernel
+					local real_version="$(ls -1r /usr/src/kernels/ | grep -v -e "${this_kernel_variant}PAE$" | head -n1)"
+					real_version=${real_version%%.$kernels_known_variants}
+				else
+					# standard kernel
+					local real_version="$(ls -1r /usr/src/kernels/ | grep -v -e "PAE$" -e "smp$" | head -n1)"
+				fi				
+				if [[ "${real_version}" ]]; then
+					echo ${real_version}${this_kernel_variant:+.${this_kernel_variant}}
+				else
+					# should we fail here?
+					echo unknown.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
+				fi
+			else
+				echo ${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
+			fi
 		fi
 	done
 }


Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- buildsys-build-rpmfusion.spec	11 Jan 2009 10:29:06 -0000	1.20
+++ buildsys-build-rpmfusion.spec	15 Jan 2009 17:36:36 -0000	1.21
@@ -3,7 +3,7 @@
 Name:           buildsys-build-%{repo}
 Epoch:          10
 Version:        11
-Release:        0.6
+Release:        0.7
 Summary:        Tools and files used by the %{repo} buildsys 
 
 Group:          Development/Tools
@@ -100,6 +100,9 @@
 
 
 %changelog
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.1
+- rebuild, and just use the latest as default
+
 * Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.6
 - rebuild for kernel 2.6.29-0.25.rc0.git14.fc11