[xorg-x11-drv-apm] Drop xinf file

Adam Jackson ajax at fedoraproject.org
Thu Dec 15 22:35:47 UTC 2011


commit f6ff6c182ee3a606e6d7fdea1ff2585311795a40
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Dec 15 22:33:51 2011 -0500

    Drop xinf file

 apm.xinf              |    2 --
 xorg-x11-drv-apm.spec |   11 ++++-------
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/xorg-x11-drv-apm.spec b/xorg-x11-drv-apm.spec
index c98ca74..ff637cd 100644
--- a/xorg-x11-drv-apm.spec
+++ b/xorg-x11-drv-apm.spec
@@ -5,13 +5,12 @@
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
 Version: 1.2.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-Source1:   apm.xinf
 Patch0:    apm-1.2.3-git.patch
 
 ExcludeArch: s390 s390x
@@ -20,7 +19,6 @@ BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
 
 Requires:  Xorg %(xserver-sdk-abi-requires ansic)
 Requires:  Xorg %(xserver-sdk-abi-requires videodrv)
-Requires:  hwdata
 
 %description 
 X.Org X11 apm video driver.
@@ -39,9 +37,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
-
 # FIXME: Remove all libtool archives (*.la) from modules directory.  This
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
@@ -52,10 +47,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{driverdir}/apm_drv.so
-%{_datadir}/hwdata/videoaliases/apm.xinf
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Thu Dec 15 2011 Adam Jackson <ajax at redhat.com> 1.2.3-11
+- Drop xinf file
+
 * Wed Nov 16 2011 Adam Jackson <ajax at redhat.com> 1.2.3-10
 - apm-1.2.3-git.patch: sync with git for new ABI
 


More information about the scm-commits mailing list