From c346258c9f78b1710b279bce0c49fc0ce777653e Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Fri, 30 Sep 2005 11:24:37 +0000
Subject: [PATCH] - Renamed package to remove xorg-x11 from the name due to
 unanimous     decision between developers. - Use Fedora Extras style
 BuildRoot tag. - Disable static library creation by default. - Add missing
 defattr to devel subpackage - Add missing documentation files to doc macro

---
 libxkbfile.spec | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/libxkbfile.spec b/libxkbfile.spec
index a08bd81..98d5e79 100644
--- a/libxkbfile.spec
+++ b/libxkbfile.spec
@@ -1,18 +1,18 @@
-%define pkgname libxkbfile
+
 Summary: X.Org X11 libxkbfile runtime library
-Name: xorg-x11-%{pkgname}
+Name: libxkbfile
 Version: 0.99.0
-Release: 2
+Release: 3
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.x.org
-Source0: %{pkgname}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: libX11-devel
 
-Provides: %{pkgname}
+
 Conflicts: XFree86-libs, xorg-x11-libs
 
 %description
@@ -23,22 +23,28 @@ Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{pkgname}-devel
+
 Conflicts: XFree86-devel, xorg-x11-devel
 
 %description devel
 X.Org X11 libxkbfile development package
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q
+
+# Disable static library creation by default.
+%define with_static 0
 
 %build
-cd %{pkgname}-%{version}
-%configure
+
+%configure \
+%if ! %{with_static}
+	--disable-static
+%endif
 make
 
 %install
-cd %{pkgname}-%{version}
+
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
@@ -53,12 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING README INSTALL ChangeLog
 %dir %{_libdir}
 %{_libdir}/libxkbfile.so.1
 %{_libdir}/libxkbfile.so.1.0.0
 
 %files devel
+%defattr(-,root,root,-)
 %dir %{_includedir}/X11
 %dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/XKBbells.h
@@ -67,12 +74,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/X11/extensions/XKBrules.h
 %{_includedir}/X11/extensions/XKM.h
 %{_includedir}/X11/extensions/XKMformat.h
+%if %{with_static}
 %{_libdir}/libxkbfile.a
+%endif
 %{_libdir}/libxkbfile.so
 %dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Thu Sep 29 2005 Mike A. Harris <mharris.com> 0.99.0-3
+- Renamed package to remove xorg-x11 from the name due to unanimous decision
+  between developers.
+- Use Fedora Extras style BuildRoot tag.
+- Disable static library creation by default.
+- Add missing defattr to devel subpackage
+- Add missing documentation files to doc macro
+
 * Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
 - Renamed package to prepend "xorg-x11" to the name for consistency with
   the rest of the X11R7 packages.