rpms/buildsys-build-rpmfusion/devel buildsys-build-rpmfusion-list-kernels.sh, 1.10, 1.11 buildsys-build-rpmfusion.spec, 1.44, 1.45

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/buildsys-build-rpmfusion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13383/devel

Modified Files:
	buildsys-build-rpmfusion-list-kernels.sh 
	buildsys-build-rpmfusion.spec 
Log Message:
Fix kvariant separator



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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildsys-build-rpmfusion-list-kernels.sh	21 Nov 2013 22:29:56 -0000	1.10
+++ buildsys-build-rpmfusion-list-kernels.sh	7 Dec 2013 17:11:34 -0000	1.11
@@ -31,6 +31,8 @@
 repo=rpmfusion
 myprog="buildsys-build-${repo}-kerneldevpkgs"
 supported_targetarchs="i686 x86_64 ppc ppc64 ppc64p7 armv5tel armv7l armv7hl s390x"
+#This has changed in Fedora >= 20
+variant_sep="+"
 if [[ -e ./buildsys-build-${repo}-kerneldevpkgs-current ]]; then
 	prefix=./buildsys-build-${repo}-
 else
@@ -132,11 +134,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:+${variant_sep}${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:+${variant_sep}${this_kernel_variant}}"
 				fi
 			fi
 		else
@@ -158,7 +160,7 @@
 					echo unknown.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
 				fi
 			else
-				echo ${this_kernel_verrel}.${this_target}${this_kernel_variant:+.${this_kernel_variant}}
+				echo ${this_kernel_verrel}.${this_target}${this_kernel_variant:+${variant_sep}${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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- buildsys-build-rpmfusion.spec	7 Dec 2013 15:14:17 -0000	1.44
+++ buildsys-build-rpmfusion.spec	7 Dec 2013 17:11:34 -0000	1.45
@@ -3,7 +3,7 @@
 Name:           buildsys-build-%{repo}
 Epoch:          10
 Version:        20
-Release:        0.4
+Release:        0.5
 Summary:        Tools and files used by the %{repo} buildsys 
 
 Group:          Development/Tools
@@ -86,7 +86,8 @@
 
 
 %changelog
-* Sat Dec 07 2013 Nicolas Chauvet <kwizart at gmail.com> - 10:20-0.4
+* Sat Dec 07 2013 Nicolas Chauvet <kwizart at gmail.com> - 10:20-0.5
+- Fix kernel variant + separator
 - rebuild for kernel 3.11.10-300.fc20
 
 * Sun Dec 01 2013 Nicolas Chauvet <kwizart at gmail.com> - 10:20-0.3