rpms/xorg-x11-drv-apm/devel xorg-x11-drv-apm.spec,1.16,1.17

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-apm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22751

Modified Files:
	xorg-x11-drv-apm.spec 
Log Message:
* Sat May 26 2007 Adam Jackson <ajax at redhat.com> 1.1.1-5
- Yet more merge review changes. (#226577)



Index: xorg-x11-drv-apm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-apm/devel/xorg-x11-drv-apm.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xorg-x11-drv-apm.spec	24 May 2007 18:38:03 -0000	1.16
+++ xorg-x11-drv-apm.spec	26 May 2007 19:12:42 -0000	1.17
@@ -1,11 +1,11 @@
 %define tarball xf86-video-apm
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
-%define driverdir	%{moduledir}/drivers
+%define driverdir %{moduledir}/drivers
 
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
 Version: 1.1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -16,10 +16,10 @@
 
 ExcludeArch: s390 s390x
 
-BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
+BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
 
-Requires:  xorg-x11-server-Xorg >= 1.0.99.901
+Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires:  hwdata
 
 %description 
 X.Org X11 apm video driver.
@@ -53,6 +53,9 @@
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Sat May 26 2007 Adam Jackson <ajax at redhat.com> 1.1.1-5
+- Yet more merge review changes. (#226577)
+
 * Thu May 24 2007 Adam Jackson <ajax at redhat.com> 1.1.1-4
 - Merge review changes. (#226577)