[libxklavier] sync with f17

Matthias Clasen mclasen at fedoraproject.org
Fri Apr 20 02:46:29 UTC 2012


commit a43a8c469a28eae3f42a90a440cf02bb6e4cb826
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Apr 19 22:47:09 2012 -0400

    sync with f17

 .gitignore       |    1 +
 libxklavier.spec |   10 ++++++++--
 sources          |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a6af1ce..79b1c23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libxklavier-5.0.tar.bz2
 /libxklavier-5.1.tar.bz2
 /libxklavier-5.2.tar.xz
+/libxklavier-5.2.1.tar.xz
diff --git a/libxklavier.spec b/libxklavier.spec
index 2f6ea81..ee3c708 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,6 +1,6 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	5.2
+Version:	5.2.1
 Release: 	2%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
@@ -13,6 +13,7 @@ BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
 BuildRequires: gobject-introspection-devel
+Requires: iso-codes
 Source: http://download.gnome.org/sources/libxklavier/5.2/%{name}-%{version}.tar.xz
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
@@ -46,7 +47,7 @@ needed to develop libxklavier applications.
   --with-xkb-base='%{_datadir}/X11/xkb' \
   --with-xkb-bin-base='%{_bindir}'
 
-make %{?_smp_mflags}
+make V=1 %{?_smp_mflags}
 
 
 %install
@@ -63,6 +64,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 %doc AUTHORS NEWS README COPYING.LIB
 %{_libdir}/libxklavier.so.16*
+%dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Xkl-1.0.typelib
 
 %files devel
@@ -72,9 +74,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_libdir}/libxklavier.so
 %{_includedir}/libxklavier/
 %{_datadir}/gtk-doc
+%dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Xkl-1.0.gir
 
 %changelog
+* Thu Apr 19 2012 Matthias Clasen <mclasen at redhat.com> - 5.2.1-2
+- Add a runtime dependency on iso-codes (#813833)
+
 * Thu Feb 16 2012 Ray Strode <rstrode at redhat.com> 5.2-2
 - Enable gobject-introspection
 
diff --git a/sources b/sources
index 209fa85..1314639 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2bc682bd80543f14e1ed0e5ad377fc1  libxklavier-5.2.tar.xz
+b3e718ee156d0d8883dfc3ff3bb86779  libxklavier-5.2.1.tar.xz


More information about the scm-commits mailing list