Accepting request 105569 from home:dimstar:branches:GNOME:Factory
Update to 5.2.1 - Generally nothing new compared to our 5.2.0 package... OBS-URL: https://build.opensuse.org/request/show/105569 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libxklavier?expand=0&rev=26
This commit is contained in:
parent
431a623411
commit
e8e8ea805e
3
libxklavier-5.2.1.tar.xz
Normal file
3
libxklavier-5.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e
|
||||||
|
size 312944
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7c1f04a80035e03cec992e16b89bc708a32b3578d6e133343d2cb56385d25dfe
|
|
||||||
size 312864
|
|
@ -1,34 +0,0 @@
|
|||||||
From 57785c952444e4cb9d13e43d4f9cc9713d66958b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Martin Pitt <martin.pitt@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
|
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 16 18:55:08 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 5.2.1:
|
||||||
|
+ Fixed GIR params for introspection (broken build)
|
||||||
|
- Remove xz BuildRequires now that it comes for free in the build
|
||||||
|
system.
|
||||||
|
- Drop libxklavier-fix-gir-build.patch: fixed upstream.
|
||||||
|
- Clean spec file using spec-cleaner.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 26 10:38:23 UTC 2012 - vuntz@opensuse.org
|
Thu Jan 26 10:38:23 UTC 2012 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: libxklavier
|
Name: libxklavier
|
||||||
Version: 5.2
|
Version: 5.2.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Library with X keyboard related functions
|
Summary: Library with X keyboard related functions
|
||||||
License: LGPL-2.0+
|
License: LGPL-2.0+
|
||||||
@ -25,18 +25,14 @@ Group: Development/Libraries/X11
|
|||||||
Url: http://www.freedesktop.org/Software/LibXklavier
|
Url: http://www.freedesktop.org/Software/LibXklavier
|
||||||
Source: http://download.gnome.org/sources/libxklavier/5.2/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/libxklavier/5.2/%{name}-%{version}.tar.xz
|
||||||
Source99: baselibs.conf
|
Source99: baselibs.conf
|
||||||
# PATCH-FIX-UPSTREAM libxklavier-fix-gir-build.patch vuntz@opensuse.org -- Fix build of introspection support, taken from git
|
|
||||||
Patch0: libxklavier-fix-gir-build.patch
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: glib2-devel
|
|
||||||
BuildRequires: gobject-introspection-devel >= 1.30
|
BuildRequires: gobject-introspection-devel >= 1.30
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: iso-codes-devel
|
BuildRequires: iso-codes-devel
|
||||||
BuildRequires: libxml2-devel
|
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
BuildRequires: xorg-x11-devel
|
BuildRequires: xorg-x11-devel
|
||||||
# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
BuildRequires: xz
|
BuildRequires: pkgconfig(libxml-2.0)
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -83,24 +79,23 @@ This library allows you to simplify XKB-related development.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-pic\
|
%configure --with-pic\
|
||||||
--with-xkb-base=/usr/share/X11/xkb\
|
--with-xkb-base=/usr/share/X11/xkb\
|
||||||
--disable-static
|
--disable-static
|
||||||
make %{?jobs:-j%jobs}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall
|
%make_install
|
||||||
%{__rm} -vf %{buildroot}%{_libdir}/*.la
|
rm -vf %{buildroot}%{_libdir}/*.la
|
||||||
|
|
||||||
%post -n libxklavier16 -p /sbin/ldconfig
|
%post -n libxklavier16 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libxklavier16 -p /sbin/ldconfig
|
%postun -n libxklavier16 -p /sbin/ldconfig
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%files -n libxklavier16
|
%files -n libxklavier16
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
|
Loading…
Reference in New Issue
Block a user