From 8215bda40515cfb271d62834d7fafba950d84789 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Mon, 19 Dec 2005 18:42:51 +0000
Subject: [PATCH] auto-import xorg-x11-xbitmaps-1.0.0-1 on branch devel from   
  xorg-x11-xbitmaps-1.0.0-1.src.rpm

---
 .cvsignore             |  2 +-
 sources                |  2 +-
 xorg-x11-xbitmaps.spec | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 576c522..47b2c90 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xbitmaps-0.99.1.tar.bz2
+xbitmaps-1.0.0.tar.bz2
diff --git a/sources b/sources
index 789d9cf..baf1149 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-384ac767bba58062251f6f658b210071  xbitmaps-0.99.1.tar.bz2
+fbe1dfefb35b3976bd9821ae7b8bfd10  xbitmaps-1.0.0.tar.bz2
diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec
index 0108ef1..e03873f 100644
--- a/xorg-x11-xbitmaps.spec
+++ b/xorg-x11-xbitmaps.spec
@@ -2,13 +2,13 @@
 
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
-Version: 0.99.1
-Release: 4
+Version: 1.0.0
+Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version}.tar.bz2
+Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2
 
 # NOTE: This dependency on xorg-x11-filesystem is required to work around
 # a nasty upgrade problem when going from FC4->FC5 or monolithic to
@@ -32,7 +32,7 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Upstream installs the bitmaps into /usr/include by default, however
 # they are used both at compiletime via #include, as well as at runtime by
@@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Sat Dec 17 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
+- Updated to xbitmaps 1.0.0 from X11R7 RC4.
+
 * Wed Nov 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-4
 - Updated dep to "Requires(pre): xorg-x11-filesystem >= 0.99.2-3" for new fix.
 - Moved bitmap files back into the upstream default of _includedir (#173665).