- libxkbfile 1.0.6

.cvsignore

@@ -1 +1 @@
-libxkbfile-1.0.4.tar.bz2
+libxkbfile-1.0.6.tar.bz2

libxkbfile.spec

@@ -1,7 +1,7 @@
 Summary: X.Org X11 libxkbfile runtime library
 Name: libxkbfile
-Version: 1.0.4
-Release: 10%{?dist}
+Version: 1.0.6
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -9,8 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: libX11-devel
+BuildRequires: pkgconfig(xproto) pkgconfig(x11)
 
 %description
 X.Org X11 libxkbfile runtime library
@@ -19,10 +18,6 @@ X.Org X11 libxkbfile runtime library
 Summary: X.Org X11 libxkbfile development package
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig 
-
-# needed by xkbfile.pc
-BuildRequires: xorg-x11-proto-devel
 
 %description devel
 X.Org X11 libxkbfile development package
@@ -30,17 +25,11 @@ X.Org X11 libxkbfile development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
 # FIXME: We use -fno-strict-aliasing, to work around the following bug:
 # maprules.c:1373: warning: dereferencing type-punned pointer will break strict-aliasing rules)
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -71,13 +60,13 @@ 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
 %{_libdir}/pkgconfig/xkbfile.pc
 
 %changelog
+* Wed Oct 07 2009 Adam Jackson <ajax@redhat.com> 1.0.6-1
+- libxkbfile 1.0.6
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.4-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-12b4ceb5d42b520228b5fb40a96ae6c5  libxkbfile-1.0.4.tar.bz2
+b01156e263eca8177e6b7f10441951c4  libxkbfile-1.0.6.tar.bz2