[xorg-x11-drv-apm] upstream 1.2.5 release

[Dave Airlie]

commit 79ec2275d693a15f70895df0890d2de026f2563f
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 17 20:18:59 2012 -0400

    upstream 1.2.5 release

 .gitignore            |    1 +
 apm-1.2.3-git.patch   |   34 ----------------------------------
 sources               |    2 +-
 xorg-x11-drv-apm.spec |   10 +++++-----
 4 files changed, 7 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7e8d40..49be7d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xf86-video-apm-1.2.3.tar.bz2
+/xf86-video-apm-1.2.5.tar.bz2
diff --git a/sources b/sources
index 3ce06b4..a4e2df6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2
+bce02d48c66932d082786167af22835a  xf86-video-apm-1.2.5.tar.bz2
diff --git a/xorg-x11-drv-apm.spec b/xorg-x11-drv-apm.spec
index 824f3b2..740aa93 100644
--- a/xorg-x11-drv-apm.spec
+++ b/xorg-x11-drv-apm.spec
@@ -4,15 +4,13 @@
 
 Summary:   Xorg X11 apm video driver
 Name:      xorg-x11-drv-apm
-Version: 1.2.3
-Release: 15%{?dist}
+Version: 1.2.5
+Release: 1%{?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
-Patch0:    apm-1.2.3-git.patch
-
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
 BuildRequires: xorg-x11-server-sdk >= 1.10.99.902
@@ -26,7 +24,6 @@ X.Org X11 apm video driver.
 %prep
 
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
 
 %build
 %configure --disable-static
@@ -50,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/apm.4*
 
 %changelog
+* Tue Jul 17 2012 Dave Airlie <airlied at redhat.com> 1.2.5-1
+- upstream 1.2.5 release
+
 * Sat Feb 11 2012 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.3-15
 - ABI rebuild