Author: firewing Update of /cvs/nonfree/rpms/livna-config-display/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv30900/F-14 Modified Files: livna-config-display.spec Added Files: livna-config-display-0.0.24-catalyst.patch Log Message: Add patch to fix traceback on startup with recent Catalyst drivers Also, retire (add dead.package) for devel & F-16 branches livna-config-display-0.0.24-catalyst.patch: ConfigurationDialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE livna-config-display-0.0.24-catalyst.patch --- --- src/ConfigurationDialog.py 2008-12-25 15:55:02.000000000 -0500 +++ src/ConfigurationDialog.py 2011-10-28 18:45:26.152423471 -0400 @@ -284,12 +284,12 @@ self.recommended = 'AIGLX' elif self.vendor == "nvidia-legacy": self.recommended = MSG_NONE - elif self.vendor == "fglrx": + elif self.vendor in ["fglrx", "catalyst"]: self.supports.append('AIGLX') self.supports.append('Xgl') self.recommended = 'AIGLX' # No driver installed? - elif self.vendor == 'False': + else: self.ui.DriverNameLabel.set_text(MSG_NONE_FOUND) self.supports = ['Unknown'] self.recommended = 'AIGLX' Index: livna-config-display.spec =================================================================== RCS file: /cvs/nonfree/rpms/livna-config-display/F-14/livna-config-display.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- livna-config-display.spec 30 Aug 2010 15:34:41 -0000 1.9 +++ livna-config-display.spec 28 Oct 2011 23:01:27 -0000 1.10 @@ -2,13 +2,14 @@ Name: livna-config-display Version: 0.0.24 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manage graphic drivers from the Livna repository URL: http://rpm.livna.org License: GPLv2+ Group: System Environment/Base Source0: http://downloads.diffingo.com/livna/livna-config-display/%{name}-%{versio... +Patch0: livna-config-display-0.0.24-catalyst.patch Requires: pygtk2, pygtk2-libglade Requires: usermode @@ -27,9 +28,7 @@ %prep %setup -q -#pushd src/livnaConfigDisplay -#patch0 -b .patch0 -#popd +%patch0 -b .catalyst %build make %{?_smp_mflags} @@ -64,6 +63,9 @@ %doc TODO CHANGELOG COPYING %changelog +* Fri Oct 28 2011 Stewart Adam <s.adam at diffingo.com> - 0.0.24-2 +- Add patch to fix traceback on startup with recent Catalyst drivers + * Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 0.0.24-1 - Update to 0.0.24 - Remove dependency on system-config-display