rpms/kmodtool/devel kmodtool-kmodtool, 1.5, 1.6 kmodtool.spec, 1.6, 1.7

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/kmodtool/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20653/devel

Modified Files:
	kmodtool-kmodtool kmodtool.spec 
Log Message:
Update to support UsrMove



Index: kmodtool-kmodtool
===================================================================
RCS file: /cvs/free/rpms/kmodtool/devel/kmodtool-kmodtool,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kmodtool-kmodtool	26 Feb 2009 13:51:15 -0000	1.5
+++ kmodtool-kmodtool	7 Feb 2012 12:51:25 -0000	1.6
@@ -1,8 +1,9 @@
 #!/bin/bash
 
 # kmodtool - Helper script for building kernel module RPMs
-# Copyright (c) 2003-2008 Ville Skyttä <ville.skytta at iki.fi>,
+# Copyright (c) 2003-2012 Ville Skyttä <ville.skytta at iki.fi>,
 #                         Thorsten Leemhuis <fedora at leemhuis.info>
+#                         Nicolas Chauvet <kwizart at gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +27,7 @@
 shopt -s extglob
 
 myprog="kmodtool-${repo}"
-myver="0.11.5"
+myver="0.12.0"
 
 kmodname=
 build_kernels="current"
@@ -43,16 +44,16 @@
 	shift
 	echo "Error: $@" >&2
 	# the next line is not multi-line safe -- not needed *yet*
-	echo "%define kmodtool_check echo \"kmodtool error: $@\"; exit ${errorlevel};"
+	echo "%global kmodtool_check echo \"kmodtool error: $@\"; exit ${errorlevel};"
 	exit ${errorlevel}
 }
 
 print_rpmtemplate_header()
 {
 	echo
-	echo '%define kmodinstdir_prefix  '/lib/modules/
-	echo '%define kmodinstdir_postfix '/extra/${kmodname}/
-	echo '%define kernel_versions     '${kernel_versions}
+	echo '%global kmodinstdir_prefix  '/usr/lib/modules/
+	echo '%global kmodinstdir_postfix '/extra/${kmodname}/
+	echo '%global kernel_versions     '${kernel_versions}
 	echo
 }
 
@@ -61,7 +62,7 @@
 	echo
 	cat <<EOF
 
-%define akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\
+%global akmod_install mkdir -p \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/; \\\
 rpmbuild --define "_sourcedir %{_sourcedir}" \\\
 --define "_srcrpmdir \$RPM_BUILD_ROOT/%{_usrsrc}/akmods/" \\\
 -bs --nodeps %{_specdir}/%{name}.spec ; \\\
@@ -187,7 +188,7 @@
 kernel ${kernel_uname_r} for the %{_target_cpu} family of processors.
 %files        -n kmod-${kmodname}-${kernel_uname_r}
 %defattr(644,root,root,755)
-/lib/modules/${kernel_uname_r}/extra/${kmodname}/
+/usr/lib/modules/${kernel_uname_r}/extra/${kmodname}/
 
 
 EOF
@@ -237,14 +238,14 @@
 			# parse kernel versions string and print template
 			local kernel_verrelarch=${kernel%%${kernels_known_variants}}
 			print_rpmtemplate_per_kmodpkg --redhat ${kernel} ${kernel##${kernel_verrelarch}}
-		elif [[ -e /lib/modules/"${kernel}"/build/Makefile ]] ; then 
+		elif [[ -e /usr/lib/modules/"${kernel}"/build/Makefile ]] ; then 
 			# likely a user-build-kernel with available buildfiles
 			# fixme: we should check if uname from Makefile is the same as ${kernel}
 
-			kernel_versions="${kernel_versions}${kernel}___/lib/modules/${kernel}/build/ "
+			kernel_versions="${kernel_versions}${kernel}___/usr/lib/modules/${kernel}/build/ "
 			print_rpmtemplate_per_kmodpkg --custom "${kernel}"
 		else
-			error_out 2 "Don't know how to handle ${kernel} -- /lib/modules/${kernel}/build/Makefile not found"
+			error_out 2 "Don't know how to handle ${kernel} -- /usr/lib/modules/${kernel}/build/Makefile not found"
 		fi
 	done
 


Index: kmodtool.spec
===================================================================
RCS file: /cvs/free/rpms/kmodtool/devel/kmodtool.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmodtool.spec	29 Mar 2009 13:19:45 -0000	1.6
+++ kmodtool.spec	7 Feb 2012 12:51:25 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           kmodtool
 Version:        1
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Tool for building kmod packages
 
 Group:          Development/Tools
@@ -51,6 +51,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Feb 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 1-19
+- Update to 0.12.0
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1-18
 - rebuild for new F11 features