rpms/xorg-x11-drv-nvidia-173xx/F-12 xorg-x11-drv-nvidia-173xx.spec, 1.11, 1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2417/F-12
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-12/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nvidia-173xx.spec 14 Nov 2009 21:32:24 -0000 1.11
+++ xorg-x11-drv-nvidia-173xx.spec 24 Nov 2009 22:46:11 -0000 1.12
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.22
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-173xx-kmod >= %{version}
Requires(post): nvidia-173xx-kmod >= %{version}
@@ -267,8 +269,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia-173xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -276,7 +281,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -298,6 +305,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-1
- Update to 173.14.22
- Update blacklist-nouveau.conf for F-12
15 years
rpms/xorg-x11-drv-nvidia-173xx/devel xorg-x11-drv-nvidia-173xx.spec, 1.11, 1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2417/devel
Modified Files:
xorg-x11-drv-nvidia-173xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/devel/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nvidia-173xx.spec 14 Nov 2009 21:32:24 -0000 1.11
+++ xorg-x11-drv-nvidia-173xx.spec 24 Nov 2009 22:46:10 -0000 1.12
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.22
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-173xx-kmod >= %{version}
Requires(post): nvidia-173xx-kmod >= %{version}
@@ -267,8 +269,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia-173xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -276,7 +281,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -298,6 +305,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.22-1
- Update to 173.14.22
- Update blacklist-nouveau.conf for F-12
15 years
rpms/xorg-x11-drv-nvidia-173xx/F-11 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-nvidia-173xx.spec, 1.13, 1.14
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2417/F-11
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia-173xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 31 Aug 2009 19:52:05 -0000 1.6
+++ .cvsignore 24 Nov 2009 22:46:11 -0000 1.7
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.20-pkg0.run
-NVIDIA-Linux-x86_64-173.14.20-pkg0.run
+NVIDIA-Linux-x86_64-173.14.22-pkg0.run
+NVIDIA-Linux-x86-173.14.22-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 31 Aug 2009 19:52:05 -0000 1.6
+++ sources 24 Nov 2009 22:46:11 -0000 1.7
@@ -1,2 +1,2 @@
-1274759c7e17a039f322a38097de0a98 NVIDIA-Linux-x86-173.14.20-pkg0.run
-8bddf91b7a98b296e2ae2b657bc5f971 NVIDIA-Linux-x86_64-173.14.20-pkg0.run
+148d68a518348330fd8047266552776c NVIDIA-Linux-x86_64-173.14.22-pkg0.run
+6bbf9a164cd3f8b84774c6bdca758a14 NVIDIA-Linux-x86-173.14.22-pkg0.run
Index: xorg-x11-drv-nvidia-173xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/xorg-x11-drv-nvidia-173xx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-nvidia-173xx.spec 10 Oct 2009 17:24:31 -0000 1.13
+++ xorg-x11-drv-nvidia-173xx.spec 24 Nov 2009 22:46:11 -0000 1.14
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-173xx
Version: 173.14.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -30,11 +30,15 @@
%define __find_provides %{SOURCE92}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 11
+%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-settings
Requires: nvidia-173xx-kmod >= %{version}
Requires(post): nvidia-173xx-kmod >= %{version}
@@ -253,8 +257,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia-173xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -262,7 +269,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -284,6 +293,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 173.14.20-3
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 173.14.20-2
- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
15 years
rpms/xorg-x11-drv-nvidia-96xx/F-12 xorg-x11-drv-nvidia-96xx.spec, 1.14, 1.15
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1214/F-12
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-12/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-nvidia-96xx.spec 14 Nov 2009 22:09:50 -0000 1.14
+++ xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:37:43 -0000 1.15
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-96xx-kmod >= %{version}
Requires(post): nvidia-96xx-kmod >= %{version}
@@ -254,8 +256,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia-96xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -263,7 +268,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -283,6 +290,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
- Update to 96.43.14
- Update blacklist-nouveau.conf for F-12
15 years
rpms/xorg-x11-drv-nvidia-96xx/devel xorg-x11-drv-nvidia-96xx.spec, 1.14, 1.15
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1214/devel
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-nvidia-96xx.spec 14 Nov 2009 22:09:50 -0000 1.14
+++ xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:37:43 -0000 1.15
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.14
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-96xx-kmod >= %{version}
Requires(post): nvidia-96xx-kmod >= %{version}
@@ -254,8 +256,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia-96xx
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -263,7 +268,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -283,6 +290,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
- Update to 96.43.14
- Update blacklist-nouveau.conf for F-12
15 years
rpms/xorg-x11-drv-nvidia-96xx/F-11 .cvsignore, 1.5, 1.6 blacklist-nouveau.conf, 1.1, 1.2 sources, 1.5, 1.6 xorg-x11-drv-nvidia-96xx.spec, 1.12, 1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1214/F-11
Modified Files:
.cvsignore blacklist-nouveau.conf sources
xorg-x11-drv-nvidia-96xx.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 31 Aug 2009 20:12:06 -0000 1.5
+++ .cvsignore 24 Nov 2009 22:37:44 -0000 1.6
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-96.43.13-pkg0.run
-NVIDIA-Linux-x86-96.43.13-pkg0.run
+NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+NVIDIA-Linux-x86-96.43.14-pkg0.run
Index: blacklist-nouveau.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/blacklist-nouveau.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blacklist-nouveau.conf 9 Jun 2009 20:39:47 -0000 1.1
+++ blacklist-nouveau.conf 24 Nov 2009 22:37:44 -0000 1.2
@@ -1,4 +1,4 @@
# RPM Fusion blacklist for nouveau driver - you need to run as root:
-# mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
# if nouveau is loaded despite this file.
blacklist nouveau
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 31 Aug 2009 20:12:06 -0000 1.5
+++ sources 24 Nov 2009 22:37:44 -0000 1.6
@@ -1,2 +1,2 @@
-200f4aac06a9b9d8c2fb6cf5b08c2443 NVIDIA-Linux-x86_64-96.43.13-pkg0.run
-ed4a1f2e22e900aecc693fb3e3c4fde3 NVIDIA-Linux-x86-96.43.13-pkg0.run
+6924d94b07163d7d71b44f53471dfb83 NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+4c1524c5f88e684bb1045ca759c11526 NVIDIA-Linux-x86-96.43.14-pkg0.run
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-nvidia-96xx.spec 10 Oct 2009 17:27:05 -0000 1.12
+++ xorg-x11-drv-nvidia-96xx.spec 24 Nov 2009 22:37:44 -0000 1.13
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.13
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -30,7 +30,9 @@
%define __find_provides %{SOURCE92}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{?fedora} >= 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
@@ -270,6 +272,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2
- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
15 years
rpms/xorg-x11-drv-nvidia/F-12 xorg-x11-drv-nvidia.spec,1.32,1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28764/F-12
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-12/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-nvidia.spec 14 Nov 2009 17:25:23 -0000 1.32
+++ xorg-x11-drv-nvidia.spec 24 Nov 2009 21:41:43 -0000 1.33
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
@@ -286,8 +288,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -295,7 +300,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -326,6 +333,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-4
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-3
- Remove execstack on nvidia binaries and libraries.
15 years
rpms/xorg-x11-drv-nvidia/F-11 xorg-x11-drv-nvidia.spec,1.32,1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28764/F-11
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-11/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-nvidia.spec 31 Oct 2009 12:18:58 -0000 1.32
+++ xorg-x11-drv-nvidia.spec 24 Nov 2009 21:41:42 -0000 1.33
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,12 +37,15 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
+BuildRequires: prelink
Requires: which
Requires: livna-config-display >= 0.0.21
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
@@ -240,6 +243,17 @@
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+# Remove execstack needs on F-12 and laters
+%if 0%{?fedora} >= 12 || 0%{?rhel} > 5
+find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%ifarch x86_64
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-{settings,smi}
+execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+%endif
+%endif
+
%clean
@@ -274,8 +288,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -283,7 +300,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -314,6 +333,15 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-4
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-3
+- Remove execstack on nvidia binaries and libraries.
+
+* Tue Nov 3 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-2
+- Update blacklist-nouveau.conf - rfbz#914
+
* Sat Oct 31 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-1
- Update to 190.42
15 years
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.32,1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28764/devel
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Use nvidia-xconfig and nvidia-settings built from sources.
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- xorg-x11-drv-nvidia.spec 14 Nov 2009 17:25:23 -0000 1.32
+++ xorg-x11-drv-nvidia.spec 24 Nov 2009 21:41:43 -0000 1.33
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Version: 190.42
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -37,6 +37,8 @@
%else
ExclusiveArch: i386 x86_64
%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version}
@@ -286,8 +288,11 @@
%doc nvidiapkg/usr/share/doc/*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
%{_initrddir}/nvidia
-%{_bindir}/*
-%{_sbindir}/*
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_bindir}/nvidia-smi
+%{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -295,7 +300,9 @@
#/no_multilib
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
-%{_mandir}/man[1-9]/nvidia*.*
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+%{_mandir}/man1/nvidia-smi.*
%files libs
%defattr(-,root,root,-)
@@ -326,6 +333,9 @@
%changelog
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-4
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 190.42-3
- Remove execstack on nvidia binaries and libraries.
15 years
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.33,1.34
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7856
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Tue Nov 24 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta2
- Bump to beta2
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- VirtualBox-OSE-kmod.spec 12 Nov 2009 16:49:00 -0000 1.33
+++ VirtualBox-OSE-kmod.spec 23 Nov 2009 23:11:27 -0000 1.34
@@ -12,7 +12,7 @@
Name: VirtualBox-OSE-kmod
Version: 3.1.0
-Release: 0.1.beta1%{?dist}
+Release: 0.1.beta2%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -82,7 +82,7 @@
%check
# If we built modules, check if it was everything the kmodsrc package provided
-MODS=$(find $RPM_BUILD_ROOT -name '*.ko' -exec basename '{}' \; |wc -l)
+MODS=$(find $(ls -d $RPM_BUILD_ROOT/lib/modules/* |head -n1) -name '*.ko' -exec basename '{}' \; |wc -l)
DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
@@ -92,6 +92,9 @@
%changelog
+* Tue Nov 24 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta2
+- Bump to beta2
+
* Thu Nov 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta1
- Bump to beta
15 years