rpms/xorg-x11-drv-catalyst/F-11 filter-provides.sh, NONE, 1.1 filter-requires.sh, NONE, 1.1 xorg-x11-drv-catalyst.spec, 1.3, 1.4

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18411

Modified Files:
	xorg-x11-drv-catalyst.spec 
Added Files:
	filter-provides.sh filter-requires.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 '/libGL.so/d'



--- NEW FILE filter-requires.sh ---
#!/bin/sh

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 '/libGL.so/d'



Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-11/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-catalyst.spec	12 Sep 2009 02:20:32 -0000	1.3
+++ xorg-x11-drv-catalyst.spec	10 Oct 2009 17:34:41 -0000	1.4
@@ -8,7 +8,7 @@
 
 Name:            xorg-x11-drv-catalyst
 Version:         9.9
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         AMD's proprietary driver for ATI graphic cards
 Group:           User Interface/X Hardware Support
 License:         Redistributable, no modification permitted
@@ -25,6 +25,12 @@
 Source10:        catalyst.sh
 Source11:        catalyst.csh
 Source13:        blacklist-radeon.conf
+# So we don't mess with mesa provides.
+Source91:        filter-requires.sh
+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)
 
@@ -308,6 +314,9 @@
 %{_includedir}/fglrx/
 
 %changelog
+* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 9.9-2
+- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
+
 * Fri Sep 11 2009 Stewart Adam <s.adam at diffingo.com> - 9.9-1
 - Update to Catalyst 9.9 (internal version 8.65.4)