- updated to 3.2.0; merged from DEVEL

Changed files:
    gdk.patch -> 1.2
    libgnomekbd.spec -> 1.26

diff --git a/gdk.patch b/gdk.patch
deleted file mode 100644 (file)
index 7e9ee90..0000000
--- a/gdk.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e431fae90ed97debb86fc9e0c89622e524feb213 Mon Sep 17 00:00:00 2001
-From: Saleem Abdulrasool <compnerd@compnerd.org>
-Date: Thu, 23 Dec 2010 01:08:04 +0000
-Subject: fix for newer gtk+
-
----
-diff --git a/configure.in b/configure.in
-index f50990d..59a8753 100644
---- a/configure.in
-+++ b/configure.in
-@@ -16,7 +16,7 @@ dnl ***************************************************************************
- dnl *** Minimum library versions for libgnomekbd                            ***
- dnl ***************************************************************************
- GLIB_REQUIRED=2.18
--GDK_REQUIRED=2.18
-+GDK_REQUIRED=2.91.7
- GTK_REQUIRED=2.90
- LIBXKLAVIER_REQUIRED=5.0
- 
-@@ -63,7 +63,7 @@ PKG_CHECK_MODULES(GDK, gdk-3.0 >= $GDK_REQUIRED)
- AC_SUBST(GDK_CFLAGS)
- AC_SUBST(GDK_LIBS)
- 
--PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED gdk-x11-3.0 >= $GDK_REQUIRED)
-+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
- 
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
---
-cgit v0.8.3.1

diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 501589a492c205b0be93ad73a433ec0d7b17648c..e77f57cf6c774894cbb25a6c8581b2400ed91fed 100644 (file)
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,16 +1,17 @@
 Summary:       A keyboard configuration library
 Summary(pl.UTF-8):     Biblioteka do konfiguracji klawiatury
 Name:          libgnomekbd
-Version:       3.0.0.1
+Version:       3.2.0
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 6f0506d7481922ac9b34b4f50987703e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: ba185a14cb128041205d618a465f9de3
 URL:           http://www.gnome.org/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.9
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.18.0
 BuildRequires: gnome-common >= 2.20.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk+3-devel >= 3.0.0
@@ -20,6 +21,8 @@ BuildRequires:        libxklavier-devel >= 5.1
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.593
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): glib2 >= 1:2.26.0
 Conflicts:     control-center < 1:2.17.92