[xorg-x11-drv-ati] Drop xinf file
Adam Jackson
ajax at fedoraproject.org
Thu Dec 15 22:36:45 UTC 2011
commit 31dfb7498edf449a3a792444250ecd07e693e16e
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Dec 15 22:34:48 2011 -0500
Drop xinf file
xorg-x11-drv-ati.spec | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index a2fc6f9..b6df834 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -11,15 +11,13 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.14.3
-Release: 3%{?gver}%{?dist}
+Release: 4%{?gver}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
#Source0: http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Source0: %{tarball}-%{gitdate}.tar.xz
-# unlike the other drivers, radeon.xinf is generated
-Source1: mkxinf
Patch6: radeon-6.9.0-bgnr-enable.patch
Patch10: radeon-6.12.2-lvds-default-modes.patch
@@ -35,7 +33,6 @@ BuildRequires: kernel-headers >= 2.6.27-0.308
BuildRequires: automake autoconf libtool pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.1.5
-Requires: hwdata
Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires videodrv)
Requires: libdrm >= 2.4.17-0.1
@@ -63,11 +60,6 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-%{SOURCE1} src/pcidb/ati_pciids.csv > radeon.xinf
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 radeon.xinf $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
-
find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
%clean
@@ -77,7 +69,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{driverdir}/ati_drv.so
%{driverdir}/radeon_drv.so
-%{_datadir}/hwdata/videoaliases/radeon.xinf
%{moduledir}/multimedia/theatre200_drv.so
%{moduledir}/multimedia/theatre_detect_drv.so
%{moduledir}/multimedia/theatre_drv.so
@@ -85,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/radeon.4*
%changelog
+* Thu Dec 15 2011 Adam Jackson <ajax at redhat.com> 6.14.3-4
+- Drop xinf file
+
* Fri Nov 25 2011 Dave Airlie <airlied at redhat.com> 6.14.3-3.20111125git534fb6e41
- rebase to master includes ppc evergreen fix.
More information about the scm-commits
mailing list