Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30384 Modified Files: xorg-x11-drv-nvidia.spec .cvsignore sources Log Message: Update to 319.60 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.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- xorg-x11-drv-nvidia.spec 2 Oct 2013 09:25:00 -0000 1.98 +++ xorg-x11-drv-nvidia.spec 2 Oct 2013 10:04:42 -0000 1.99 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 319.60 -Release: 0%{?dist} +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -22,10 +22,12 @@ Source6: blacklist-nouveau.conf BuildRequires: desktop-file-utils +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 Buildrequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%endif ExclusiveArch: i686 x86_64 armv7hl @@ -110,11 +112,16 @@ %prep %setup -q -c -T +#Only extract the needed arch +%ifarch %{ix86} sh %{SOURCE0} --extract-only --target nvidiapkg-i686 +%endif +%ifarch x86_64 sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64 +%endif +%ifarch armv7hl sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl -tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel - +%endif ln -s nvidiapkg-%{_target_cpu} nvidiapkg %build @@ -226,16 +233,24 @@ #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 mkdir -p $RPM_BUILD_ROOT%{_unitdir} install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \ $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service #Change the daemon running owner sed -i -e "s/__USER__/root/" $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service +%endif #Create the default nvidia config directory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia +%pre +if [ "$1" -eq "1" ]; then + if [ -x %{_bindir}/nvidia-uninstall ]; then + %{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || : + fi +fi %post if [ "$1" -eq "1" ]; then @@ -259,7 +274,9 @@ &>/dev/null done fi +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 /bin/systemctl daemon-reload >/dev/null 2>&1 || : +%endif fi || : %triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5 @@ -311,20 +328,24 @@ done fi +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 /bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || : /bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || : +%endif #Backup and disable previously used xorg.conf [ -f %{_sysconfdir}/X11/xorg.conf ] && \ mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null fi ||: +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall /bin/systemctl try-restart nvidia-persistenced.service >/dev/null 2>&1 || : fi +%endif %postun libs -p /sbin/ldconfig @@ -344,7 +365,9 @@ %config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 %{_unitdir}/nvidia-persistenced.service +%endif %{_bindir}/nvidia-bug-report.sh %{_bindir}/nvidia-debugdump %{_bindir}/nvidia-smi @@ -399,6 +422,9 @@ %changelog +* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:319.60-1 +- Update to 319.60 + * Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:319.32-7 - Disable Obsoletes/Provides of nvidia tools until rhbz#985944 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 24 Jul 2013 10:32:22 -0000 1.52 +++ .cvsignore 2 Oct 2013 10:04:42 -0000 1.53 @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-319.32.run -NVIDIA-Linux-x86-319.32.run -NVIDIA-Linux-x86_64-319.32.run +NVIDIA-Linux-armv7l-gnueabihf-319.60.run +NVIDIA-Linux-x86-319.60.run +NVIDIA-Linux-x86_64-319.60.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 24 Jul 2013 10:32:22 -0000 1.56 +++ sources 2 Oct 2013 10:04:42 -0000 1.57 @@ -1,3 +1,3 @@ -1cbf302ed5b5a9988e1c575f8f01336a NVIDIA-Linux-armv7l-gnueabihf-319.32.run -978339ff37c3207f3a39d3952721dcdb NVIDIA-Linux-x86-319.32.run -608767a3e1bee8a030f31cdc9251182e NVIDIA-Linux-x86_64-319.32.run +28b4f8fdddf70b25d8c5f1e73fcd71e7 NVIDIA-Linux-armv7l-gnueabihf-319.60.run +893958183acc35feb0740747c7da306b NVIDIA-Linux-x86-319.60.run +e31404d2e5aa0fa90b5b138ed9c666a3 NVIDIA-Linux-x86_64-319.60.run