From a2739b2f3c02a09705c5fc8cfee0a5cc284414da Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 11 Nov 2005 23:19:38 +0000
Subject: [PATCH] auto-import xorg-x11-xbitmaps-0.99.1-1 on branch devel from  
   xorg-x11-xbitmaps-0.99.1-1.src.rpm

---
 .cvsignore             |  2 +-
 sources                |  2 +-
 xorg-x11-xbitmaps.spec | 36 ++++++++++++++----------------------
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a32fa43..576c522 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xbitmaps-0.99.0.tar.bz2
+xbitmaps-0.99.1.tar.bz2
diff --git a/sources b/sources
index 22bf2ee..789d9cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a910bcd038f2c557e062cf66a3b67acf  xbitmaps-0.99.0.tar.bz2
+384ac767bba58062251f6f658b210071  xbitmaps-0.99.1.tar.bz2
diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec
index b3a3eec..123c025 100644
--- a/xorg-x11-xbitmaps.spec
+++ b/xorg-x11-xbitmaps.spec
@@ -1,15 +1,4 @@
 %define pkgname xbitmaps
-# FIXME: Upstream version of xfs tarball is 0.99.0, which would require
-# us to add an "Epoch: 1" to this package in order for rpm to upgrade from
-# the FC4 (and earlier) monolithic xorg-x11-xfs-6.8.x rpm package.  Since
-# it is currently unknown what the final upstream tarball version is likely
-# to be called, I am avoiding adding Epoch, and instead using a 6.99.99.x
-# version number for the time being.  This allows us to make sure xfs will
-# upgrade from older releases to the new release, allows us to avoid adding
-# an Epoch tag possibly unnecessarily - as Epoch is permanent and very evil.
-# If upstream later names it "xfs-7.0", then we bump the version to that,
-# and everything just works.
-%define upstreamversion 0.99.0
 
 # FIXME: The X11 bitmaps are used at both compile time and runtime if I am
 # not completely mistaken.  Either way, they are architecture independant
@@ -21,12 +10,12 @@
 
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
-Version: 0.99.0
+Version: 0.99.1
 Release: 1
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{upstreamversion}.tar.bz2
+Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version}.tar.bz2
 #Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
@@ -59,24 +48,24 @@ Provides: %{pkgname}-devel
 X.Org X11 application bitmaps
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n xbitmaps-%{version}
 
 %build
 # Build xbitmaps
-{
-   pushd %{pkgname}-%{upstreamversion}
+#{
+#   pushd %{pkgname}-%{version}
    %configure
    make
-   popd
-}
+#   popd
+#}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-{
-   pushd %{pkgname}-%{upstreamversion}
+#{
+#   pushd %{pkgname}-%{version}
    %makeinstall
-   popd
-}
+#   popd
+#}
 # 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
 # other apps.  Being pedantically correct, it makes sense to install them
@@ -107,5 +96,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-1
+- Updated to xbitmaps 0.99.1 from X11R7 RC2
+
 * Fri Aug 26 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
 - Initial build.