Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19028/F-18 Modified Files: nvidia-snapshot.sh xorg-x11-drv-nvidia.spec Log Message: Update nvidia-snapshot to be URL and arches agnostic Index: nvidia-snapshot.sh =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/nvidia-snapshot.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nvidia-snapshot.sh 18 Oct 2012 22:24:03 -0000 1.3 +++ nvidia-snapshot.sh 2 Oct 2013 09:25:00 -0000 1.4 @@ -12,14 +12,23 @@ unset CDPATH pwd=$(pwd) -version=$(grep Version xorg-x11-drv-nvidia*.spec | cut -f 2 -d ':' | sed 's/ //g') +nvspec=$(ls ${pwd}/xorg-x11-drv-nvidia*.spec) +version=$(grep ^Version: ${nvspec} | awk '{print $2}') +arches="$(grep ^ExclusiveArch: ${nvspec} | awk '{print $2,$3,$4}')" -for arch in x86 x86_64 ; do - if [ ! -e NVIDIA-Linux-${arch}-${version}.run ] ; then - wget -N ftp://download.nvidia.com/XFree86/Linux-${arch}/${version}/NVIDIA-Linux-$... + +#Avoid to re-create an existing tarball + [ -e ${pwd}/nvidia-kmod-data-${version}.tar.xz ] && exit 0 + +for arch in ${arches} ; do + nvarch=${arch} + [ ${arch} == i686 ] && nvarch=x86 + [ ${arch} == armv7hl ] && nvarch=armv7l-gnueabihf + if [ ! -e NVIDIA-Linux-${nvarch}-${version}.run ] ; then + spectool --gf -S ${nvspec} fi - sh NVIDIA-Linux-${arch}-${version}.run --extract-only --target nvidiapkg-${arch} + sh NVIDIA-Linux-${nvarch}-${version}.run --extract-only --target nvidiapkg-${arch} done -tar -cJf nvidia-kmod-data-${version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel +tar Jcf nvidia-kmod-data-${version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- xorg-x11-drv-nvidia.spec 24 Jul 2013 10:32:22 -0000 1.97 +++ xorg-x11-drv-nvidia.spec 2 Oct 2013 09:25:00 -0000 1.98 @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 319.32 -Release: 7%{?dist} +Version: 319.60 +Release: 0%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support