Author: leigh123linux Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9530 Modified Files: sources xorg-x11-drv-nvidia.spec Log Message: * Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:325.15-1 - Update to 325.15 release Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 13 Jul 2013 15:21:44 -0000 1.58 +++ sources 29 Sep 2013 23:00:02 -0000 1.59 @@ -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 +686e8d2293a8349c1b18bff1024c12a4 NVIDIA-Linux-armv7l-gnueabihf-325.15.run +528fc538584de6446384b9cec3099d6c NVIDIA-Linux-x86-325.15.run +323c3ef74f607aef63d602c7f297ce86 NVIDIA-Linux-x86_64-325.15.run Index: xorg-x11-drv-nvidia.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- xorg-x11-drv-nvidia.spec 21 Jul 2013 14:56:02 -0000 1.110 +++ xorg-x11-drv-nvidia.spec 29 Sep 2013 23:00:02 -0000 1.111 @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 319.32 -Release: 7%{?dist} +Version: 325.15 +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 @@ -393,12 +416,16 @@ %endif %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so +%{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libnvcuvid.so %{_nvidia_libdir}/libnvidia-ml.so %{_nvidia_libdir}/libnvidia-opencl.so - +%{_nvidia_libdir}/libnvidia-vgxcfg.so %changelog +* Tue Aug 06 2013 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:325.15-1 +- Update to 325.15 release + * Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1:319.32-7 - Disable Obsoletes/Provides of nvidia tools until rhbz#985944