Author: jjneely
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11734
Modified Files:
openafs-kmod.spec
Removed Files:
0001-Linux-2.6.39-deal-with-BKL-removal.patch
0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch
Log Message:
* Fri Oct 14 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-2
- rpmFusion Bug # 1938 Patch from Ken Dreyer
- correct akmod package build deps
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openafs-kmod.spec 7 Sep 2011 19:42:13 -0000 1.5
+++ openafs-kmod.spec 14 Oct 2011 17:38:19 -0000 1.6
@@ -1,7 +1,7 @@
# (un)define the next line to either build for the newest or all current kernels
#define buildforkernels newest
#define buildforkernels current
-#define buildforkernels akmods
+%define buildforkernels akmod
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -33,16 +33,12 @@
Source0:
http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: %{_bindir}/kmodtool
-BuildRequires: pam-devel, ncurses-devel, flex, byacc, bison, automake
+%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc,
bison, automake
+BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i586 i686 x86_64 ppc ppc64
-# get the proper build-sysbuild package from the repo, which
-# tracks in all the kernel-devel packages
-BuildRequires: %{_bindir}/kmodtool
-
%{!?kernels:BuildRequires:
buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu}
}
# kmodtool does its magic here
@@ -89,10 +85,9 @@
install -d -m 755
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
install -m 755
_kmod_build_${kernel_version%%___*}/src/libafs/MODLOAD-${kernel_version%%___*}-MP/libafs.ko
\
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/%{kmod_name}.ko
+ chmod u+x
${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/%{kmod_name}.ko
done
-chmod u+x ${RPM_BUILD_ROOT}/lib/modules/*/extra/*/*
-
%{?akmod_install}
@@ -101,6 +96,10 @@
%changelog
+* Fri Oct 14 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-2
+- rpmFusion Bug # 1938 Patch from Ken Dreyer
+- correct akmod package build deps
+
* Tue Sep 06 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-1
- Update to OpenAFS 1.6.0 final
--- 0001-Linux-2.6.39-deal-with-BKL-removal.patch DELETED ---
--- 0002-Linux-2.6.39-replace-path_lookup-with-kern_path.patch DELETED ---