From dfa3624b1e8f93e5b4e32ff38f14862d32ea17a8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sat, 6 Jan 2007 05:01:29 +0000 Subject: [PATCH] auto-import xorg-x11-drv-fbdev-0.3.1-1.fc7 on branch devel from xorg-x11-drv-fbdev-0.3.1-1.fc7.src.rpm --- .cvsignore | 2 +- sources | 2 +- xorg-x11-drv-fbdev.spec | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 096da95..c7903d3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-fbdev-0.3.0.tar.bz2 +xf86-video-fbdev-0.3.1.tar.bz2 diff --git a/sources b/sources index 6ed0f2c..1e8f1b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2472494502317c2582b90ccf64da5044 xf86-video-fbdev-0.3.0.tar.bz2 +9ae810c6c6c3c9713a67866fe794d4ff xf86-video-fbdev-0.3.1.tar.bz2 diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index 747f060..f52c724 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -6,8 +6,8 @@ Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.3.0 -Release: 2 +Version: 0.3.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X Hardware Support @@ -17,9 +17,6 @@ Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64 -# FIXME: move me upstream -Patch0: fbdev-0.2.0-debug.patch - Patch1: fbdev-0.3.0-32fbbpp.patch BuildRequires: pkgconfig @@ -32,8 +29,9 @@ X.Org X11 fbdev video driver. %prep %setup -q -n %{tarball}-%{version} -%patch0 -p1 -b .debug -%patch1 -p1 -b .fbbpp +# Not sure if this is still necessary, it doesn't apply anymore and the new +# code looks like it'll have the same effect. XXX check with katzj. +# %patch1 -p1 -b .fbbpp %build %configure --disable-static @@ -60,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/fbdev.4* %changelog +* Fri Jan 05 2007 Adam Jackson 0.3.1-1 +- Update to 0.3.1 + * Mon Aug 28 2006 Jeremy Katz - 0.3.0-2 - adjust to prefer 32bpp over 24bpp for fbbpp (#204117)