Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17739 Modified Files: filter-requires.sh xorg-x11-drv-nvidia-96xx.spec Added Files: filter-provides.sh Log Message: - Avoid Requires/Provides of the libGL.so.1 . rfbz#859 --- NEW FILE filter-provides.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then FINDPROV=/usr/lib/rpm/redhat/find-provides else FINDPROV=/usr/lib/rpm/find-provides fi $FINDPROV $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d' Index: filter-requires.sh =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-11/filter-requires.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-requires.sh 30 Oct 2008 13:30:02 -0000 1.1 +++ filter-requires.sh 10 Oct 2009 17:27:05 -0000 1.2 @@ -1,10 +1,10 @@ #!/bin/sh -if [ -x /usr/lib/rpm/redhat/find-provides ]; then +if [ -x /usr/lib/rpm/redhat/find-requires ]; then FINDREQ=/usr/lib/rpm/redhat/find-requires else FINDREQ=/usr/lib/rpm/find-requires fi -$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' +$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d' 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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-drv-nvidia-96xx.spec 31 Aug 2009 20:12:06 -0000 1.11 +++ xorg-x11-drv-nvidia-96xx.spec 10 Oct 2009 17:27:05 -0000 1.12 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia-96xx Version: 96.43.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -23,8 +23,11 @@ Source11: nvidia-96xx-README.Fedora # So we don't pull other nvidia variants Source91: filter-requires.sh +# So we don't mess with mesa provides. +Source92: filter-provides.sh %define _use_internal_dependency_generator 0 %define __find_requires %{SOURCE91} +%define __find_provides %{SOURCE92} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if 0%{?fedora} >= 11 @@ -267,6 +270,9 @@ %changelog +* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2 +- Avoid Requires/Provides of the libGL.so.1 . rfbz#859 + * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1 - Update to 96.43.13 (beta)