rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-kerneldevpkgs-current, 1.1, 1.2 buildsys-build-rpmfusion-list-kernels.sh, 1.3, 1.4
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1637
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion-list-kernels.sh
Log Message:
last change fas bogus; this is how it's supposed to be
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file:
/cvs/free/rpms/buildsys-build-rpmfusion/devel/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildsys-build-rpmfusion-kerneldevpkgs-current 2 Oct 2008 17:05:32 -0000 1.1
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 2 Oct 2008 21:11:16 -0000 1.2
@@ -1,3 +1,3 @@
2.6.27-0.352.rc7.git1.fc10
-2.6.27-0.352.rc7.git1.fc10-smp
-2.6.27-0.352.rc7.git1.fc10-PAE
+2.6.27-0.352.rc7.git1.fc10smp
+2.6.27-0.352.rc7.git1.fc10PAE
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildsys-build-rpmfusion-list-kernels.sh 2 Oct 2008 19:11:59 -0000 1.3
+++ buildsys-build-rpmfusion-list-kernels.sh 2 Oct 2008 21:11:16 -0000 1.4
@@ -86,7 +86,7 @@
# go
${this_command} ${this_grepoptions} ${this_kernellistfiles} | while read this_kernel; do
- this_kernel_verrel=${this_kernel%%-$kernels_known_variants}
+ this_kernel_verrel=${this_kernel%%$kernels_known_variants}
this_kernel_variant=${this_kernel##$this_kernel_verrel}
if [[ "${requires}" ]] || [[ "${buildrequires}" ]]; then
@@ -100,11 +100,11 @@
fi
else
if [[ "${requires}" ]]; then
- echo "Requires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant##-}}"
+ echo "Requires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}"
fi
if [[ "${buildrequires}" ]]; then
- echo "BuildRequires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant##-}}"
+ echo "BuildRequires: kernel-devel-uname-r =
${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}"
fi
fi
else