9:14 p.m.
Author: firewing
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18483
Modified Files:
.cvsignore sources xorg-x11-drv-catalyst.spec
Log Message:
* Mon Dec 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.12-1
- Update to Catalyst 9.12 (internal version 8.68.1)
- Remove rpaths from binaries
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-11/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 24 Oct 2009 05:17:27 -0000 1.6
+++ .cvsignore 28 Dec 2009 21:14:24 -0000 1.7
@@ -1,2 +1 @@
-ati-driver-installer-9-10-x86.x86_64.run
-ati-driver-installer-9-10-x86.x86_64.run
+ati-driver-installer-9-12-x86.x86_64.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 24 Oct 2009 05:17:27 -0000 1.5
+++ sources 28 Dec 2009 21:14:24 -0000 1.6
@@ -1,2 +1 @@
-c79bed0ec7e96a11105922a70aea7a9c ati-driver-installer-9-10-x86.x86_64.run
-c79bed0ec7e96a11105922a70aea7a9c ati-driver-installer-9-10-x86.x86_64.run
+a6b2b52921add6f39c3bfa9d366d8820 ati-driver-installer-9-12-x86.x86_64.run
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-catalyst.spec 24 Oct 2009 05:17:27 -0000 1.5
+++ xorg-x11-drv-catalyst.spec 28 Dec 2009 21:14:24 -0000 1.6
@@ -7,13 +7,13 @@
%endif
Name: xorg-x11-drv-catalyst
-Version: 9.10
+Version: 9.12
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
-Source0:
https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
+Source0:
https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-dri...
Source1: catalyst-README.Fedora
Source3: catalyst-config-display
Source4: catalyst-init
@@ -41,6 +41,8 @@
Requires: catalyst-kmod >= %{version}
+# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
+BuildRequires: chrpath
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
Requires: livna-config-display >= 0.0.23
@@ -134,7 +136,7 @@
rm -rf $RPM_BUILD_ROOT ./__doc
set +x
-for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e
'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$'
-e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e
'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e
'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e
'^./lib/modules/fglrx' -e '/usr/share/icons/ccc_')
+for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e
'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$'
-e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e
'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e
'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e
'^./lib/modules/fglrx' -e '/usr/share/icons/ccc_' -e
'^./usr/share/ati/lib')
do
if [[ ! "/${file##}" = "/${file}" ]]
then
@@ -211,7 +213,6 @@
install -D -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.sh
install -D -p -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/catalyst.csh
-install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_small.xpm
$RPM_BUILD_ROOT/%{_datadir}/icons/ccc_small.xpm
install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm
$RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/%(basename %{SOURCE3})
install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/catalyst
@@ -236,6 +237,10 @@
chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+# Remove rpaths (see comment on chrpath BR above)
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
+chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -308,6 +313,10 @@
%{_includedir}/fglrx/
%changelog
+* Mon Dec 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.12-1
+- Update to Catalyst 9.12 (internal version 8.68.1)
+- Remove rpaths from binaries
+
* Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 9.10-1
- Update to Catalyst 9.10 (internal version 8.66.1)
- Remove radeon blacklists and update README: fglrx module is now compatible