From 4a797a890975d8db0ac5269eb4736a19046b6923 Mon Sep 17 00:00:00 2001 From: mharris Date: Fri, 4 Nov 2005 23:19:22 +0000 Subject: [PATCH] auto-import xorg-x11-drv-fbdev-0.1.0.1-1 on branch devel from xorg-x11-drv-fbdev-0.1.0.1-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- xorg-x11-drv-fbdev.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4e5c7d0..d1edfb3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-fbdev-0.1.0.tar.bz2 +xf86-video-fbdev-0.1.0.1.tar.bz2 diff --git a/sources b/sources index 10cd3c3..e995317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dfea05f7b2ca671d17519829e3355a7 xf86-video-fbdev-0.1.0.tar.bz2 +803d387169a06ef0543855c635a31c3f xf86-video-fbdev-0.1.0.1.tar.bz2 diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index f47fe7f..3a5de58 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -4,14 +4,14 @@ # the "filesystem" package. %define moduledir %(pkg-config xorg-server --variable=moduledir ) # define driverdir to the appropriate type for this driver class -%define driverdir %(pkg-config xorg-server --variable=driverdir ) +%define driverdir %{moduledir}/drivers %define cvsdate xxxxxxx Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.1.0 -Release: 1 +Version: 0.1.0.1 +Release: 1 URL: http://www.x.org # FIXME: If using a CVS version, uncomment the second Source0 line and use # it instead. @@ -46,7 +46,7 @@ make install DESTDIR=$RPM_BUILD_ROOT # FIXME: Remove all libtool archives (*.la) from modules directory. This # should be fixed in upstream Makefile.am or whatever. -find $RPM_BUILD_ROOT%{moduledir} -name '*.la' | xargs rm -f -- +find $RPM_BUILD_ROOT -regex ".*.la$" | xargs rm -f -- %clean rm -rf $RPM_BUILD_ROOT @@ -60,10 +60,13 @@ rm -rf $RPM_BUILD_ROOT #%dir %{moduledir}/multimedia #%{moduledir}/multimedia/*.so %dir %{_mandir} -%dir %{_mandir}/man4 -%{_mandir}/man4/*.4* +%dir %{_mandir}/man4x +%{_mandir}/man4x/*.4x* %changelog +* Fri Nov 4 2005 Mike A. Harris 0.1.0.1-1 +- Updated xorg-x11-drv-fbdev to version 0.1.0.1 from X11R7 RC1 +- Fix *.la file removal. * Mon Oct 3 2005 Mike A. Harris 0.1.0-1 - Update BuildRoot to use Fedora Packaging Guidelines. - Deglob file manifest.