Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17048 Modified Files: filter-requires.sh xorg-x11-drv-nvidia-173xx.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-173xx/F-11/filter-requires.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-requires.sh 12 Nov 2008 11:26:19 -0000 1.1 +++ filter-requires.sh 10 Oct 2009 17:19:59 -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-173xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-173xx/F-11/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 31 Aug 2009 19:52:05 -0000 1.11 +++ xorg-x11-drv-nvidia-173xx.spec 10 Oct 2009 17:19:59 -0000 1.12 @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia-173xx Version: 173.14.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's 173xx serie proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -22,9 +22,12 @@ Source10: nvidia-173xx-config-display Source11: nvidia-173xx-README.Fedora # So we don't pull other nvidia variants -Source91: filter-requires.sh -%define _use_internal_dependency_generator 0 -%define __find_requires %{SOURCE91} +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 @@ -281,6 +284,9 @@ %changelog +* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 1173.14.20-2 +- Avoid Requires/Provides of the libGL.so.1 . rfbz#859 + * Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 173.14.20-1 - Update to 173.14.20 (beta)