rpms/fglrx-kmod/F-8 fglrx-kmod.spec,1.3,1.4

Author: firewing Update of /cvs/nonfree/rpms/fglrx-kmod/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3298/F-8 Modified Files: fglrx-kmod.spec Log Message: Remove make.sh from the build process (thanks kwizart for the patch!) Index: fglrx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/fglrx-kmod/F-8/fglrx-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fglrx-kmod.spec 16 Oct 2008 23:48:18 -0000 1.3 +++ fglrx-kmod.spec 17 Oct 2008 13:53:04 -0000 1.4 @@ -15,7 +15,7 @@ Name: fglrx-kmod Version: 8.542 -Release: 2.%{ativersion}%{?dist}.1 +Release: 3.%{ativersion}%{?dist}.1 # Taken over by kmodtool Summary: AMD display driver kernel module Group: System Environment/Kernel @@ -25,7 +25,6 @@ Source11: fglrx-kmodtool-excludekernel-filterfile # These control kernel version detection Patch1: fglrx-makefile.diff -Patch2: fglrx-makesh.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -74,7 +73,6 @@ # These control kernel version detection pushd fglrxpkg/lib/modules/fglrx/build_mod/ %patch1 -b .patch1 -%patch2 -b .patch2 popd for kernel_version in %{kernel_versions} ; do @@ -84,13 +82,8 @@ %build for kernel_version in %{kernel_versions}; do - pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/ - export AS_USER=y - export KERNEL_PATH="${kernel_version##*___}" - export FEDORA_UNAME_R="${kernel_version%%___*}" - export FEDORA_UNAME_M="%{_target_cpu}" - export CC="gcc" - bash make.sh verbose + pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x + make CC="gcc" PAGE_ATTR_FIX=0 KERNEL_PATH="${kernel_version##*___}" popd done @@ -108,6 +101,9 @@ %changelog +* Fri Oct 17 2008 kwizart < kwizart at gmail.com > - 8.542-3.8.10.1 +- Drop the make.sh layer + * Thu Oct 16 2008 Stewart Adam <s.adam at diffingo.com> - 8.542-2.8.10.1 - Update patches