Hello community, here is the log from the commit of package libxklavier for openSUSE:Factory checked in at 2012-01-27 21:27:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxklavier (Old) and /work/SRC/openSUSE:Factory/.libxklavier.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxklavier", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libxklavier/libxklavier.changes 2011-10-07 10:32:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxklavier.new/libxklavier.changes 2012-01-27 21:27:05.000000000 +0100 @@ -1,0 +2,29 @@ +Thu Jan 26 10:38:23 UTC 2012 - vu...@opensuse.org + +- license update: LGPL-2.0+ + No indication of GPL-2.0+ tools or utilities (apart from + configure, etc.) + +------------------------------------------------------------------- +Wed Jan 18 06:40:17 UTC 2012 - vu...@opensuse.org + +- Update to version 5.2: + + Optional introspection introduced + + Some minor fixes (runtime and build-time) +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Add gobject-introspection-devel BuildRequires to build + introspection support. +- Add libxklavier-fix-gir-build.patch to fix build of introspection + support. +- Create typelib-1_0-Xkl-1_0 subpackage for typelib file. +- Add typelib-1_0-Xkl-1_0 Requires to devel subpackage. +- Remove glib2-devel and libxml2-devel Requires from devel + subpackage: they will automatically be added the pkgconfig() way. +- Remove Requires for the XFree86-devel provider from devel + subpackage: it's not needed according to the pkgconfig file. +- Change group of libxklavier16 from Development/Libraries/X11 to + System/Libraries. + +------------------------------------------------------------------- Old: ---- libxklavier-5.1.tar.bz2 New: ---- libxklavier-5.2.tar.xz libxklavier-fix-gir-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxklavier.spec ++++++ --- /var/tmp/diff_new_pack.HhG2bu/_old 2012-01-27 21:27:10.000000000 +0100 +++ /var/tmp/diff_new_pack.HhG2bu/_new 2012-01-27 21:27:10.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libxklavier # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,38 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libxklavier -BuildRequires: doxygen glib2-devel gtk-doc iso-codes-devel libxml2-devel pkg-config xorg-x11-devel -License: GPL-2.0+ ; LGPL-2.1+ -Group: Development/Libraries/X11 -Version: 5.1 -Release: 1 +Version: 5.2 +Release: 0 Summary: Library with X keyboard related functions -Source: %{name}-%{version}.tar.bz2 -Source99: baselibs.conf +License: LGPL-2.0+ +Group: Development/Libraries/X11 Url: http://www.freedesktop.org/Software/LibXklavier +Source: http://download.gnome.org/sources/libxklavier/5.2/%{name}-%{version}.tar.xz +Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libxklavier-fix-gir-build.patch vu...@opensuse.org -- Fix build of introspection support, taken from git +Patch0: libxklavier-fix-gir-build.patch +BuildRequires: doxygen +BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel >= 1.30 +BuildRequires: gtk-doc +BuildRequires: iso-codes-devel +BuildRequires: libxml2-devel +BuildRequires: pkg-config +BuildRequires: xorg-x11-devel +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This library allows you to simplify XKB-related development. %package devel -License: GPL-2.0+ ; LGPL-2.1+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/X11 -Requires: %{name} = %{version} glib2-devel libxml2-devel glibc-devel %(rpm -q --whatprovides XFree86-devel --queryformat '%{NAME}') +Requires: %{name} = %{version} +Requires: glibc-devel +Requires: typelib-1_0-Xkl-1_0 = %{version} %description devel This package contains all necessary include files and libraries needed to develop applications that require these. %package -n libxklavier16 -License: GPL-2.0+ ; LGPL-2.1+ Summary: Library with X keyboard related functions -Group: Development/Libraries/X11 +Group: System/Libraries Requires: iso-codes Provides: %{name} = %{version} Obsoletes: %{name} < %{version} @@ -54,8 +63,17 @@ %description -n libxklavier16 This library allows you to simplify XKB-related development. +%package -n typelib-1_0-Xkl-1_0 +Summary: Library with X keyboard related functions -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Xkl-1_0 +This library allows you to simplify XKB-related development. + +This package provides the GObject Introspection bindings for +libxklavier. + %package doc -License: GPL-2.0+ ; LGPL-2.1+ Summary: Additional Package Documentation for libxklavier Group: Development/Libraries/X11 Requires: %{name} = %{version} @@ -65,6 +83,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --with-pic\ @@ -86,13 +105,18 @@ %files -n libxklavier16 %defattr(-,root,root) %doc AUTHORS COPYING.LIB CREDITS ChangeLog NEWS README -%{_libdir}/*.so.* +%{_libdir}/libxklavier.so.* + +%files -n typelib-1_0-Xkl-1_0 +%defattr(-,root,root) +%{_libdir}/girepository-1.0/Xkl-1.0.typelib %files devel %defattr (-, root, root) -%{_includedir}/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_includedir}/libxklavier/ +%{_libdir}/libxklavier.so +%{_libdir}/pkgconfig/libxklavier.pc +%{_datadir}/gir-1.0/Xkl-1.0.gir %files doc %defattr (-, root, root) ++++++ libxklavier-fix-gir-build.patch ++++++ >From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001 From: Martin Pitt <martin.p...@ubuntu.com> Date: Mon, 16 Jan 2012 15:00:18 +0000 Subject: Use local include files for building GIR Add -I argument for g-ir-scanner to use the include files from the local tree instead of the ones installed in the system. --- Index: libxklavier-5.2/libxklavier/Makefile.am =================================================================== --- libxklavier-5.2.orig/libxklavier/Makefile.am +++ libxklavier-5.2/libxklavier/Makefile.am @@ -94,7 +94,7 @@ introspection_sources = $(xklavier_heade Xkl-1.0.gir: libxklavier.la Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 -Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) +Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) Xkl_1_0_gir_LIBS = libxklavier.la Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) INTROSPECTION_GIRS += Xkl-1.0.gir Index: libxklavier-5.2/libxklavier/Makefile.in =================================================================== --- libxklavier-5.2.orig/libxklavier/Makefile.in +++ libxklavier-5.2/libxklavier/Makefile.in @@ -343,7 +343,7 @@ INTROSPECTION_COMPILER_ARGS = --included # avoid introspecting private headers @HAVE_INTROSPECTION_TRUE@introspection_sources = $(xklavier_headers) $(filter %.c, $(libxklavier_la_SOURCES)) @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_INCLUDES = GObject-2.0 xlib-2.0 -@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) +@HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_CFLAGS = -I$(top_srcdir) $(INCLUDES) $(X_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_LIBS = libxklavier.la @HAVE_INTROSPECTION_TRUE@Xkl_1_0_gir_FILES = $(xklavier_headers) $(introspection_sources) @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
