rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.105,1.106
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3742
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Fix missing man pages
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.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- xorg-x11-drv-nvidia.spec 13 Jul 2013 19:59:12 -0000 1.105
+++ xorg-x11-drv-nvidia.spec 13 Jul 2013 20:23:34 -0000 1.106
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.32
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -364,8 +364,8 @@
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
-%exclude %{_mandir}/man1/nvidia-persistenced.1.*
-%exclude %{_mandir}/man1/nvidia-modprobe.1.*
+%{_mandir}/man1/nvidia-persistenced.1.*
+%{_mandir}/man1/nvidia-modprobe.1.*
%files libs
%defattr(-,root,root,-)
@@ -397,7 +397,7 @@
%changelog
-* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-4
- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
- Add virtual provides for nvidia-modprobe/nvidia-persistenced
- Enable nvidia-persistenced systemd service
10 years, 10 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.57, 1.58 sources, 1.60, 1.61 xorg-x11-drv-nvidia.spec, 1.107, 1.108
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3588/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Rebase to beta driver
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore 8 Jul 2013 16:52:42 -0000 1.57
+++ .cvsignore 13 Jul 2013 20:22:49 -0000 1.58
@@ -1,2 +1,3 @@
-NVIDIA-Linux-x86_64-325.08.run
+NVIDIA-Linux-armv7l-gnueabihf-325.08.run
NVIDIA-Linux-x86-325.08.run
+NVIDIA-Linux-x86_64-325.08.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources 8 Jul 2013 16:52:42 -0000 1.60
+++ sources 13 Jul 2013 20:22:49 -0000 1.61
@@ -1,2 +1,3 @@
-f0f3361071b36543f53e3a357ae7a513 NVIDIA-Linux-x86_64-325.08.run
+b2d238fd94a509a86b9ae9b70ce351ae NVIDIA-Linux-armv7l-gnueabihf-325.08.run
b4545f20c4fa0716e8bfa7f732b1ff44 NVIDIA-Linux-x86-325.08.run
+f0f3361071b36543f53e3a357ae7a513 NVIDIA-Linux-x86_64-325.08.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- xorg-x11-drv-nvidia.spec 8 Jul 2013 16:52:43 -0000 1.107
+++ xorg-x11-drv-nvidia.spec 13 Jul 2013 20:22:49 -0000 1.108
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 325.08
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,32 +16,32 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-#Source4: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-armv7...
+Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
Source6: blacklist-nouveau.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
-%else 0%{?fedora} == 11
-ExclusiveArch: i586 x86_64
-%else
-ExclusiveArch: i386 x86_64
-%endif
-Requires: nvidia-xconfig
-Requires: %{_nvidia_serie}-settings
+BuildRequires: desktop-file-utils
+Buildrequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+ExclusiveArch: i686 x86_64 armv7hl
+
+Obsoletes: nvidia-xconfig < 1.0-30
+Provides: nvidia-xconfig = %{version}-%{release}
+Obsoletes: nvidia-settings < 1.0-34
+Provides: nvidia-settings = %{version}-%{release}
+Obsoletes: nvidia-settings-desktop < 1.0-34
+Provides: nvidia-settings-desktop = %{version}-%{release}
+Provides: nvidia-modprobe = %{version}-%{release}
+Provides: nvidia-persistenced = %{version}-%{release}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
-# Needed in all nvidia or fglrx driver packages
Requires: which
-#Requires: livna-config-display >= 0.0.21
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
-%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
-%endif
Requires(post): ldconfig
Requires(postun): ldconfig
@@ -91,11 +91,7 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
-%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
-%endif
%description devel
This package provides the development files of the %{name} package,
@@ -106,7 +102,6 @@
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%description libs
This package provides the shared libraries for %{name}.
@@ -114,15 +109,12 @@
%prep
%setup -q -c -T
-sh %{SOURCE0} --extract-only --target nvidiapkg-x86
-sh %{SOURCE1} --extract-only --target nvidiapkg-x64
+sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-%ifarch %{ix86}
-ln -s nvidiapkg-x86 nvidiapkg
-%else
-ln -s nvidiapkg-x64 nvidiapkg
-%endif
+ln -s nvidiapkg-%{_target_cpu} nvidiapkg
%build
# Nothing to build
@@ -151,16 +143,26 @@
install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-# OpenCL config
-install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
-install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
-
# Simple wildcard install of libs
+install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
+install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
+%ifarch x86_64 i686
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
-install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
+%endif
+
+%ifarch x86_64 i686
+# OpenCL config
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
+
+#Vdpau
+install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+%endif
#
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -177,10 +179,10 @@
%endif
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
-install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-mps-control,cuda-mps-server,persistenced,modprobe} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced,modprobe} \
+ $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -197,9 +199,6 @@
ln -s ${lib##*/} ${lib%.%{version}}.1
done
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
-
# Install nvidia icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -215,9 +214,28 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+# Desktop entry for nvidia-settings
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+ --set-icon=nvidia-settings \
+ --set-key=Exec --set-value=nvidia-settings \
+ nvidia-settings.desktop
+
+#Workaround for self made xorg.conf using a Files section.
+ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+
+#Install the initscript
+tar jxf nvidia-persistenced-init.tar.bz2
+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
+
+#Create the default nvidia config directory
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
+
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
if [ "$1" -eq "1" ]; then
@@ -241,6 +259,7 @@
&>/dev/null
done
fi
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi || :
%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
@@ -291,11 +310,22 @@
gfxpayload=vga=normal vga=normal" &>/dev/null
done
fi
+
+ /bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || :
+ /bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || :
+
#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 ||:
+%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
+
%postun libs -p /sbin/ldconfig
%files
@@ -303,24 +333,34 @@
%doc nvidiapkg/LICENSE
%doc nvidiapkg/NVIDIA_Changelog
%doc nvidiapkg/README.txt
+%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
%doc nvidiapkg/html
+%ifarch x86_64 i686
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%endif
+%dir %{_sysconfdir}/nvidia
%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
+%{_unitdir}/nvidia-persistenced.service
%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
%{_bindir}/nvidia-persistenced
%{_bindir}/nvidia-modprobe
+%{_bindir}/nvidia-settings
+%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
#/no_multilib
+%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
@@ -330,32 +370,46 @@
%files libs
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
-%dir %{_nvidia_libdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/*.so.*
+%ifarch x86_64 i686
+%dir %{_nvidia_libdir}/tls
%{_nvidia_libdir}/tls/*.so*
%exclude %{_libdir}/vdpau/libvdpau.*
%{_libdir}/vdpau/libvdpau_nvidia.so*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
+%endif
%files devel
%defattr(-,root,root,-)
%exclude %{_nvidia_libdir}/libcuda.so
%{_includedir}/nvidia/
+%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
+%{_nvidia_libdir}/libnvidia-encode.so
+%endif
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
-%{_nvidia_libdir}/libnvidia-encode.so
%{_nvidia_libdir}/libnvidia-vgxcfg.so
-
%changelog
-* Sun Jul 07 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-1
-- Update to 325.08
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:325.08-2
+- Rebased to 325.08
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+- Add virtual provides for nvidia-modprobe/nvidia-persistenced
+- Enable nvidia-persistenced systemd service
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2
+- Add armhfp support
+- Spec file clean-up
+
+* Sun Jul 07 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:319.32-1.1
- move .so files to devel
* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
10 years, 10 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.104,1.105
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1987
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Restore nvidia-settings and nvidia-xconfig - rfbz#2852
Add virtual provides for nvidia-modprobe/nvidia-persistenced
Enable nvidia-persistenced systemd service
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.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- xorg-x11-drv-nvidia.spec 13 Jul 2013 15:21:44 -0000 1.104
+++ xorg-x11-drv-nvidia.spec 13 Jul 2013 19:59:12 -0000 1.105
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 319.32
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -21,13 +21,25 @@
Source3: nvidia-xorg.conf
Source6: blacklist-nouveau.conf
+BuildRequires: desktop-file-utils
+Buildrequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
ExclusiveArch: i686 x86_64 armv7hl
-Requires: nvidia-xconfig
-Requires: %{_nvidia_serie}-settings
+
+Obsoletes: nvidia-xconfig < 1.0-30
+Provides: nvidia-xconfig = %{version}-%{release}
+Obsoletes: nvidia-settings < 1.0-34
+Provides: nvidia-settings = %{version}-%{release}
+Obsoletes: nvidia-settings-desktop < 1.0-34
+Provides: nvidia-settings-desktop = %{version}-%{release}
+Provides: nvidia-modprobe = %{version}-%{release}
+Provides: nvidia-persistenced = %{version}-%{release}
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
-# Needed in all nvidia or fglrx driver packages
Requires: which
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
@@ -169,7 +181,8 @@
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,persistenced,modprobe} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced,modprobe} \
+ $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -201,6 +214,28 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+# Desktop entry for nvidia-settings
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+ --set-icon=nvidia-settings \
+ --set-key=Exec --set-value=nvidia-settings \
+ nvidia-settings.desktop
+
+#Workaround for self made xorg.conf using a Files section.
+ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+
+#Install the initscript
+tar jxf nvidia-persistenced-init.tar.bz2
+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
+
+#Create the default nvidia config directory
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia
+
+
%post
if [ "$1" -eq "1" ]; then
@@ -224,6 +259,7 @@
&>/dev/null
done
fi
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi || :
%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5
@@ -274,11 +310,22 @@
gfxpayload=vga=normal vga=normal" &>/dev/null
done
fi
+
+ /bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || :
+ /bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || :
+
#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 ||:
+%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
+
%postun libs -p /sbin/ldconfig
%files
@@ -286,27 +333,34 @@
%doc nvidiapkg/LICENSE
%doc nvidiapkg/NVIDIA_Changelog
%doc nvidiapkg/README.txt
+%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
%doc nvidiapkg/html
%ifarch x86_64 i686
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%endif
+%dir %{_sysconfdir}/nvidia
%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
+%{_unitdir}/nvidia-persistenced.service
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
-%exclude %{_bindir}/nvidia-persistenced
-%exclude %{_bindir}/nvidia-modprobe
+%{_bindir}/nvidia-persistenced
+%{_bindir}/nvidia-modprobe
+%{_bindir}/nvidia-settings
+%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
#/no_multilib
+%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
@@ -343,6 +397,11 @@
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-3
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+- Add virtual provides for nvidia-modprobe/nvidia-persistenced
+- Enable nvidia-persistenced systemd service
+
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2
- Add armhfp support
- Spec file clean-up
10 years, 10 months
rpms/xorg-x11-drv-nvidia-304xx/F-18 xorg-x11-drv-nvidia-304xx.spec, 1.10, 1.11
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27064/F-18
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Revert to internal nvidia-xconfig and nvidia-settings
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-18/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-nvidia-304xx.spec 30 Jun 2013 09:49:54 -0000 1.10
+++ xorg-x11-drv-nvidia-304xx.spec 13 Jul 2013 18:01:32 -0000 1.11
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -20,6 +20,7 @@
Source6: blacklist-nouveau.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
@@ -27,17 +28,19 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: %{_nvidia_serie}-settings
+Obsoletes: nvidia-xconfig < 1.0-30
+Provides: nvidia-xconfig = %{version}-%{release}
+Obsoletes: nvidia-settings < 1.0-34
+Provides: nvidia-settings = %{version}-%{release}
+Obsoletes: nvidia-settings-desktop < 1.0-34
+Provides: nvidia-settings-desktop = %{version}-%{release}
-Requires: %{_nvidia_serie}-kmod >= %{version}
-
-# Needed in all nvidia or fglrx driver packages
Requires: which
+Requires: %{_nvidia_serie}-kmod >= %{version}
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
Requires(post): ldconfig
@@ -50,8 +53,8 @@
Obsoletes: nvidia-kmod-common < 1:%{version}-1000
Provides: nvidia-kmod-common = 1:%{version}-1001
-Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
-Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
+Obsoletes: %{_nvidia_serie}-kmod < %{version}
+Provides: %{_nvidia_serie}-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-latest
Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-96xx
@@ -96,9 +99,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-devel < 1:%{version}-1000
@@ -111,9 +114,9 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
-Requires: %{name} = %{?epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-libs < 1:%{version}-1000
Provides: xorg-x11-drv-nvidia-libs = 1:%{version}-1001
@@ -191,7 +194,8 @@
install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_nvidia_libdir}/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server,xconfig,settings} \
+ $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -227,6 +231,13 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+# Desktop entry for nvidia-settings
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+ --set-icon=nvidia-settings \
+ --set-key=Exec --set-value=nvidia-settings \
+ nvidia-settings.desktop
+
#Workaround for self made xorg.conf using a Files section.
%if 0%{?fedora} < 20
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
@@ -334,6 +345,8 @@
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-proxy-control
%{_bindir}/nvidia-cuda-proxy-server
+%{_bindir}/nvidia-settings
+%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
@@ -342,6 +355,7 @@
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
%endif
#/no_multilib
+%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-proxy-control.1.*
@@ -374,6 +388,10 @@
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-9
+- Remove empty epoch - may solve rfbz#2874
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-8
- Restore the previous xorg.conf in posttrans
10 years, 10 months
rpms/xorg-x11-drv-nvidia-304xx/F-17 xorg-x11-drv-nvidia-304xx.spec, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27064/F-17
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Revert to internal nvidia-xconfig and nvidia-settings
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-17/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-nvidia-304xx.spec 30 Jun 2013 09:49:55 -0000 1.5
+++ xorg-x11-drv-nvidia-304xx.spec 13 Jul 2013 18:01:32 -0000 1.6
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -20,6 +20,7 @@
Source6: blacklist-nouveau.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
@@ -27,17 +28,19 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: %{_nvidia_serie}-settings
+Obsoletes: nvidia-xconfig < 1.0-30
+Provides: nvidia-xconfig = %{version}-%{release}
+Obsoletes: nvidia-settings < 1.0-34
+Provides: nvidia-settings = %{version}-%{release}
+Obsoletes: nvidia-settings-desktop < 1.0-34
+Provides: nvidia-settings-desktop = %{version}-%{release}
-Requires: %{_nvidia_serie}-kmod >= %{version}
-
-# Needed in all nvidia or fglrx driver packages
Requires: which
+Requires: %{_nvidia_serie}-kmod >= %{version}
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
Requires(post): ldconfig
@@ -50,8 +53,8 @@
Obsoletes: nvidia-kmod-common < 1:%{version}-1000
Provides: nvidia-kmod-common = 1:%{version}-1001
-Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
-Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
+Obsoletes: %{_nvidia_serie}-kmod < %{version}
+Provides: %{_nvidia_serie}-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-latest
Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-96xx
@@ -96,9 +99,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-devel < 1:%{version}-1000
@@ -111,9 +114,9 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
-Requires: %{name} = %{?epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-libs < 1:%{version}-1000
Provides: xorg-x11-drv-nvidia-libs = 1:%{version}-1001
@@ -191,7 +194,8 @@
install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_nvidia_libdir}/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server,xconfig,settings} \
+ $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -227,6 +231,13 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+# Desktop entry for nvidia-settings
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+ --set-icon=nvidia-settings \
+ --set-key=Exec --set-value=nvidia-settings \
+ nvidia-settings.desktop
+
#Workaround for self made xorg.conf using a Files section.
%if 0%{?fedora} < 20
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
@@ -334,6 +345,8 @@
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-proxy-control
%{_bindir}/nvidia-cuda-proxy-server
+%{_bindir}/nvidia-settings
+%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
@@ -342,6 +355,7 @@
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
%endif
#/no_multilib
+%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-proxy-control.1.*
@@ -374,6 +388,10 @@
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-9
+- Remove empty epoch - may solve rfbz#2874
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-8
- Restore the previous xorg.conf in posttrans
10 years, 10 months
rpms/xorg-x11-drv-nvidia-304xx/F-19 xorg-x11-drv-nvidia-304xx.spec, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27064/F-19
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Log Message:
Revert to internal nvidia-xconfig and nvidia-settings
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-19/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xorg-x11-drv-nvidia-304xx.spec 12 Jun 2013 14:48:20 -0000 1.6
+++ xorg-x11-drv-nvidia-304xx.spec 13 Jul 2013 18:01:32 -0000 1.7
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.88
-Release: 5%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -20,6 +20,7 @@
Source6: blacklist-nouveau.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
@@ -27,17 +28,19 @@
%else
ExclusiveArch: i386 x86_64
%endif
-Requires: nvidia-xconfig
-Requires: %{_nvidia_serie}-settings
+Obsoletes: nvidia-xconfig < 1.0-30
+Provides: nvidia-xconfig = %{version}-%{release}
+Obsoletes: nvidia-settings < 1.0-34
+Provides: nvidia-settings = %{version}-%{release}
+Obsoletes: nvidia-settings-desktop < 1.0-34
+Provides: nvidia-settings-desktop = %{version}-%{release}
-Requires: %{_nvidia_serie}-kmod >= %{version}
-
-# Needed in all nvidia or fglrx driver packages
Requires: which
+Requires: %{_nvidia_serie}-kmod >= %{version}
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
Requires(post): ldconfig
@@ -50,8 +53,8 @@
Obsoletes: nvidia-kmod-common < 1:%{version}-1000
Provides: nvidia-kmod-common = 1:%{version}-1001
-Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
-Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
+Obsoletes: %{_nvidia_serie}-kmod < %{version}
+Provides: %{_nvidia_serie}-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-latest
Conflicts: xorg-x11-drv-nvidia-beta
Conflicts: xorg-x11-drv-nvidia-96xx
@@ -96,9 +99,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-devel < 1:%{version}-1000
@@ -111,9 +114,9 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
-Requires: %{name} = %{?epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
#Introduced in F17 when 304xx was splitted
Obsoletes: xorg-x11-drv-nvidia-libs < 1:%{version}-1000
Provides: xorg-x11-drv-nvidia-libs = 1:%{version}-1001
@@ -191,7 +194,8 @@
install -p -m 0644 libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_nvidia_libdir}/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server,xconfig,settings} \
+ $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -227,6 +231,13 @@
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+# Desktop entry for nvidia-settings
+desktop-file-install --vendor "" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
+ --set-icon=nvidia-settings \
+ --set-key=Exec --set-value=nvidia-settings \
+ nvidia-settings.desktop
+
#Workaround for self made xorg.conf using a Files section.
%if 0%{?fedora} < 20
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
@@ -288,6 +299,8 @@
%post libs -p /sbin/ldconfig
%posttrans
+ [ -f %{_sysconfdir}/X11/xorg.conf.xorg-x11-drv-nvidia_uninstalled ] && \
+ mv %{_sysconfdir}/X11/xorg.conf.xorg-x11-drv-nvidia_uninstalled %{_sysconfdir}/X11/xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] || \
cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || :
@@ -332,6 +345,8 @@
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-proxy-control
%{_bindir}/nvidia-cuda-proxy-server
+%{_bindir}/nvidia-settings
+%{_bindir}/nvidia-xconfig
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
@@ -340,6 +355,7 @@
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
%endif
#/no_multilib
+%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-proxy-control.1.*
@@ -372,6 +388,13 @@
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-9
+- Remove empty epoch - may solve rfbz#2874
+- Restore nvidia-settings and nvidia-xconfig - rfbz#2852
+
+* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-8
+- Restore the previous xorg.conf in posttrans
+
* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.88-5
- Relax kernel flavor cases
10 years, 10 months
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.126,1.127
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21129
Modified Files:
nvidia-kmod.spec
Log Message:
Fix commit
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- nvidia-kmod.spec 13 Jul 2013 15:28:17 -0000 1.126
+++ nvidia-kmod.spec 13 Jul 2013 15:44:31 -0000 1.127
@@ -53,7 +53,7 @@
for kernel_version in %{?kernel_versions} ; do
- cp -a nvidiapkg-%{_target_cpu} ${kernel_version%%___*}
+ cp -a nvidiapkg-%{_target_cpu} _kmod_build_${kernel_version%%___*}
done
%build
10 years, 10 months
rpms/nvidia-kmod/F-19 .cvsignore, 1.56, 1.57 nvidia-kmod.spec, 1.125, 1.126 sources, 1.57, 1.58
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20508/F-19
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to 319.32 and support ARM
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 23 May 2013 23:02:59 -0000 1.56
+++ .cvsignore 13 Jul 2013 15:28:17 -0000 1.57
@@ -1 +1 @@
-nvidia-kmod-data-319.23.tar.xz
+nvidia-kmod-data-319.32.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- nvidia-kmod.spec 13 Jul 2013 08:02:28 -0000 1.125
+++ nvidia-kmod.spec 13 Jul 2013 15:28:17 -0000 1.126
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 319.23
+Version: 319.32
# Taken over by kmodtool
-Release: 1%{?dist}.7
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,17 +18,14 @@
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# <switch me> when sources are on kwizart's repo
-Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
-#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
-# </switch me>
+Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-kmodtool-excludekernel-filterfile
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64 armv7hl
# get the needed BuildRequires (in parts depending on what we build for)
BuildRequires: %{_bindir}/kmodtool
@@ -47,7 +44,7 @@
%setup -q -c -T -a 0
# patch loop
-for arch in x86 x64
+for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
echo "Nothing to patch"
@@ -56,11 +53,7 @@
for kernel_version in %{?kernel_versions} ; do
-%ifarch %{ix86}
- cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
-%else
- cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
-%endif
+ cp -a nvidiapkg-%{_target_cpu} ${kernel_version%%___*}
done
%build
@@ -84,6 +77,10 @@
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
+- Update to 319.32
+- Add support for armv7hl
+
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-1.7
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 23 May 2013 23:03:00 -0000 1.57
+++ sources 13 Jul 2013 15:28:17 -0000 1.58
@@ -1 +1 @@
-2756e7fe2a4d7808a85742fae833e13a nvidia-kmod-data-319.23.tar.xz
+823f54bebd8c9c6184935ae9c8b18cf3 nvidia-kmod-data-319.32.tar.xz
10 years, 10 months
rpms/xorg-x11-drv-nvidia/F-19 .cvsignore, 1.56, 1.57 sources, 1.57, 1.58 xorg-x11-drv-nvidia.spec, 1.103, 1.104
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20263/F-19
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Update to 319.32
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore 23 May 2013 22:58:19 -0000 1.56
+++ .cvsignore 13 Jul 2013 15:21:44 -0000 1.57
@@ -1,2 +1,3 @@
-NVIDIA-Linux-x86-319.23.run
-NVIDIA-Linux-x86_64-319.23.run
+NVIDIA-Linux-armv7l-gnueabihf-319.32.run
+NVIDIA-Linux-x86-319.32.run
+NVIDIA-Linux-x86_64-319.32.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 23 May 2013 22:58:19 -0000 1.57
+++ sources 13 Jul 2013 15:21:44 -0000 1.58
@@ -1,2 +1,3 @@
-cbdca80e11b643aa46bded82abe43754 NVIDIA-Linux-x86-319.23.run
-d4a2f01cbc3217444ac57e7da7ffe63f NVIDIA-Linux-x86_64-319.23.run
+1cbf302ed5b5a9988e1c575f8f01336a NVIDIA-Linux-armv7l-gnueabihf-319.32.run
+978339ff37c3207f3a39d3952721dcdb NVIDIA-Linux-x86-319.32.run
+608767a3e1bee8a030f31cdc9251182e NVIDIA-Linux-x86_64-319.32.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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- xorg-x11-drv-nvidia.spec 12 Jun 2013 14:56:00 -0000 1.103
+++ xorg-x11-drv-nvidia.spec 13 Jul 2013 15:21:44 -0000 1.104
@@ -7,8 +7,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 319.23
-Release: 5%{?dist}
+Version: 319.32
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,18 +16,12 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
+Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
Source2: 00-nvidia.conf
Source3: nvidia-xorg.conf
Source6: blacklist-nouveau.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} > 11 || 0%{?rhel} > 5
-ExclusiveArch: i686 x86_64
-%else 0%{?fedora} == 11
-ExclusiveArch: i586 x86_64
-%else
-ExclusiveArch: i386 x86_64
-%endif
+ExclusiveArch: i686 x86_64 armv7hl
Requires: nvidia-xconfig
Requires: %{_nvidia_serie}-settings
@@ -35,12 +29,7 @@
# Needed in all nvidia or fglrx driver packages
Requires: which
-#Requires: livna-config-display >= 0.0.21
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
-%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
-%endif
Requires(post): ldconfig
Requires(postun): ldconfig
@@ -90,11 +79,7 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
-%else
-Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
-%endif
%description devel
This package provides the development files of the %{name} package,
@@ -105,7 +90,6 @@
Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{_isa} >= 0.5
-Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%description libs
This package provides the shared libraries for %{name}.
@@ -113,15 +97,12 @@
%prep
%setup -q -c -T
-sh %{SOURCE0} --extract-only --target nvidiapkg-x86
-sh %{SOURCE1} --extract-only --target nvidiapkg-x64
+sh %{SOURCE0} --extract-only --target nvidiapkg-i686
+sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64
+sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl
tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
-%ifarch %{ix86}
-ln -s nvidiapkg-x86 nvidiapkg
-%else
-ln -s nvidiapkg-x64 nvidiapkg
-%endif
+ln -s nvidiapkg-%{_target_cpu} nvidiapkg
%build
# Nothing to build
@@ -150,16 +131,26 @@
install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-# OpenCL config
-install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
-install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
-
# Simple wildcard install of libs
+install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}
+install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
+%ifarch x86_64 i686
install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/
-install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/
+%endif
+
+%ifarch x86_64 i686
+# OpenCL config
+install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
+ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
+
+#Vdpau
+install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
+%endif
#
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -176,10 +167,9 @@
%endif
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
-install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/
# Install binaries
-install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-mps-control,cuda-mps-server,persistenced,modprobe} $RPM_BUILD_ROOT%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,persistenced,modprobe} $RPM_BUILD_ROOT%{_bindir}
# Install headers
install -m 0755 -d $RPM_BUILD_ROOT%{_includedir}/nvidia/GL/
@@ -196,9 +186,6 @@
ln -s ${lib##*/} ${lib%.%{version}}.1
done
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1
-ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so
-
# Install nvidia icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -215,9 +202,6 @@
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
if [ "$1" -eq "1" ]; then
ISGRUB1=""
@@ -303,18 +287,21 @@
%doc nvidiapkg/NVIDIA_Changelog
%doc nvidiapkg/README.txt
%doc nvidiapkg/html
+%ifarch x86_64 i686
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%endif
%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
%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-debugdump
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
-%{_bindir}/nvidia-persistenced
-%{_bindir}/nvidia-modprobe
+%exclude %{_bindir}/nvidia-persistenced
+%exclude %{_bindir}/nvidia-modprobe
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
@@ -323,36 +310,49 @@
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
-%{_mandir}/man1/nvidia-persistenced.1.*
-%{_mandir}/man1/nvidia-modprobe.1.*
+%exclude %{_mandir}/man1/nvidia-persistenced.1.*
+%exclude %{_mandir}/man1/nvidia-modprobe.1.*
%files libs
%defattr(-,root,root,-)
%dir %{_nvidia_libdir}
-%dir %{_nvidia_libdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/*.so.*
-%{_nvidia_libdir}/libcuda.so
-%{_nvidia_libdir}/libnvidia-glcore.so
+%ifarch x86_64 i686
+%dir %{_nvidia_libdir}/tls
%{_nvidia_libdir}/tls/*.so*
%exclude %{_libdir}/vdpau/libvdpau.*
%{_libdir}/vdpau/libvdpau_nvidia.so*
%exclude %{_libdir}/vdpau/libvdpau_trace.so*
+%endif
%files devel
%defattr(-,root,root,-)
%exclude %{_nvidia_libdir}/libcuda.so
%{_includedir}/nvidia/
+%ifarch x86_64 i686
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
+%{_nvidia_libdir}/libnvidia-encode.so
+%endif
%{_nvidia_libdir}/libGL.so
+%{_nvidia_libdir}/libnvidia-glcore.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
-%{_nvidia_libdir}/libnvidia-encode.so
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-2
+- Add armhfp support
+- Spec file clean-up
+
+* Sun Jul 07 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:319.32-1.1
+- move .so files to devel
+
+* Thu Jun 27 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.32-1
+- Update to 319.32
+
* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.23-5
- Relax kernel flavor cases
- Use triggerpostun to update config on updates
10 years, 10 months
rpms/wl-kmod/F-19 wl-kmod.spec,1.81,1.82
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2266
Modified Files:
wl-kmod.spec
Log Message:
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- wl-kmod.spec 6 Jul 2013 10:00:05 -0000 1.81
+++ wl-kmod.spec 13 Jul 2013 08:02:39 -0000 1.82
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 10%{?dist}.7
+Release: 10%{?dist}.8
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -101,6 +101,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
+- Rebuilt for kernel
+
* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.7
- Rebuilt for kernel
10 years, 10 months