diff --git a/.cvsignore b/.cvsignore index 68e3f61..a358204 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xf86-video-fbdev-0.1.0.4.tar.bz2 +xf86-video-fbdev-0.1.0.5.tar.bz2 diff --git a/sources b/sources index 219dac4..5cc462c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -daa7c6fd54aa10ae781a2390f2970d2a xf86-video-fbdev-0.1.0.4.tar.bz2 +cb02495cfdb84b8c4f4dbbd0702890eb xf86-video-fbdev-0.1.0.5.tar.bz2 diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index 01c5c08..f29d101 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -1,22 +1,15 @@ %define tarball xf86-video-fbdev -# All packages should own all dirs they lead up to, for saner -# rpm packaging, in particular if the leading dirs are not owned by -# the "filesystem" package. %define moduledir %(pkg-config xorg-server --variable=moduledir ) -# define driverdir to the appropriate type for this driver class %define driverdir %{moduledir}/drivers %define cvsdate xxxxxxx Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev -Version: 0.1.0.4 -Release: 1 +Version: 0.1.0.5 +Release: 1 URL: http://www.x.org -# FIXME: If using a CVS version, uncomment the second Source0 line and use -# it instead. -Source0: http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}.tar.bz2 -#Source0: http://xorg.freedesktop.org/X11R7.0-RC0/driver/%{tarball}-%{version}-%{cvsdate}.tar.bz2 +Source0: http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2 License: MIT/X11 Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,6 +20,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-server-sdk Requires: xorg-x11-server-Xorg + %description X.Org X11 fbdev video driver. @@ -39,14 +33,12 @@ make %install rm -rf $RPM_BUILD_ROOT -# FIXME: This should be using makeinstall macro instead. Please test -# makeinstall with this driver, and if it works, check it into CVS. If -# it fails, fix it in upstream sources and file a patch upstream. + 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 -regex ".*.la$" | xargs rm -f -- +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- %clean rm -rf $RPM_BUILD_ROOT @@ -56,14 +48,13 @@ rm -rf $RPM_BUILD_ROOT %dir %{moduledir} %dir %{driverdir} %{driverdir}/fbdev_drv.so -# NOTE: Uncomment when multimedia drivers are avail -#%dir %{moduledir}/multimedia -#%{moduledir}/multimedia/*.so -%dir %{_mandir} -%dir %{_mandir}/man4 -%{_mandir}/man4/*.4* +#%dir %{_mandir}/man4x +%{_mandir}/man4/fbdev.4* %changelog +* Wed Jan 18 2006 Mike A. Harris 0.1.0.5-1 +- Updated xorg-x11-drv-fbdev to version 0.1.0.5 from X11R7.0 + * Tue Dec 20 2005 Mike A. Harris 0.1.0.4-1 - Updated xorg-x11-drv-fbdev to version 0.1.0.4 from X11R7 RC4 - Removed 'x' suffix from manpage dirs to match RC4 upstream. @@ -74,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT * 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.