Accepting request 582995 from X11:XOrg
- Update to version 1.4.1 * This release adds the path of the xkbcomp executable to the pkgconfig data, allowing the X server to find the right binary regardless of where its (the X servers) $prefix is pointed. Without this the X server will guess that xkbcomp is configured for the same prefix; since the default prefix is /usr/local, and your distribution certainly did not install xkbcomp there, 'make check' and 'ninja dist' for the X server build would fail because Xvfb would not start. - supersedes U_xkbcomp_pkgconfig-add-bindir.patch - refreshed xkbcomp.keyring; seems signing key changed, since this time the package has been released by Adam Jackson (before: Daniel Stone)? Hope I got this right ... OBS-URL: https://build.opensuse.org/request/show/582995 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkbcomp?expand=0&rev=12
This commit is contained in:
commit
8f40711eb5
@ -1,20 +0,0 @@
|
|||||||
From 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Jackson <ajax@redhat.com>
|
|
||||||
Date: Mon, 6 Nov 2017 12:54:41 -0500
|
|
||||||
Subject: pkgconfig: Add our bindir to xkbcomp.pc
|
|
||||||
|
|
||||||
Reviewed-by: Daniel Stone <daniels@collabora.com>
|
|
||||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
||||||
|
|
||||||
diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in
|
|
||||||
index b8d6023..4d138c8 100644
|
|
||||||
--- a/xkbcomp.pc.in
|
|
||||||
+++ b/xkbcomp.pc.in
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
prefix=@prefix@
|
|
||||||
+bindir=@bindir@
|
|
||||||
datarootdir=@datarootdir@
|
|
||||||
datadir=@datadir@
|
|
||||||
xkbconfigdir=@XKBCONFIGROOT@
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b
|
|
||||||
size 243774
|
|
Binary file not shown.
3
xkbcomp-1.4.1.tar.bz2
Normal file
3
xkbcomp-1.4.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736
|
||||||
|
size 251069
|
BIN
xkbcomp-1.4.1.tar.bz2.sig
Normal file
BIN
xkbcomp-1.4.1.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 5 14:58:54 UTC 2018 - sndirsch@suse.com
|
||||||
|
|
||||||
|
- Update to version 1.4.1
|
||||||
|
* This release adds the path of the xkbcomp executable to the pkgconfig
|
||||||
|
data, allowing the X server to find the right binary regardless of
|
||||||
|
where its (the X servers) $prefix is pointed. Without this the X server
|
||||||
|
will guess that xkbcomp is configured for the same prefix; since the
|
||||||
|
default prefix is /usr/local, and your distribution certainly did not
|
||||||
|
install xkbcomp there, 'make check' and 'ninja dist' for the X server
|
||||||
|
build would fail because Xvfb would not start.
|
||||||
|
- supersedes U_xkbcomp_pkgconfig-add-bindir.patch
|
||||||
|
- refreshed xkbcomp.keyring; seems signing key changed, since this
|
||||||
|
time the package has been released by Adam Jackson (before: Daniel
|
||||||
|
Stone)? Hope I got this right ...
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 20 22:42:36 UTC 2017 - zaitor@opensuse.org
|
Mon Nov 20 22:42:36 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
@ -7,6 +7,14 @@ uid [ unknown] Daniel Stone <daniels@collabora.com>
|
|||||||
uid [ unknown] Daniel Stone <daniel@fooishbar.org>
|
uid [ unknown] Daniel Stone <daniel@fooishbar.org>
|
||||||
sub 4096R/2BD34171 2017-01-09
|
sub 4096R/2BD34171 2017-01-09
|
||||||
|
|
||||||
|
pub 1024D/A0ECD0D3 2004-06-13 [expires: 2015-11-01]
|
||||||
|
uid [ expired] Adam Jackson <ajax@benzedrine.nwnk.net>
|
||||||
|
uid [ expired] Adam Jackson <ajax@nwnk.net>
|
||||||
|
uid [ expired] Adam Jackson <ajax@redhat.com>
|
||||||
|
uid [ expired] Adam Jackson <ajax@engr.sgi.com>
|
||||||
|
uid [ expired] Adam Jackson <ajax@wildopensource.com>
|
||||||
|
sub 2048g/0CC0F663 2004-06-13 [expires: never ]
|
||||||
|
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
Version: GnuPG v2
|
Version: GnuPG v2
|
||||||
|
|
||||||
@ -87,6 +95,42 @@ WNEay/Emvv65lDOhmqyOC2VUgM+EXnFvkUvPeeNJ3c8Mtrn+Bgw5LMyZrfCB6ocF
|
|||||||
TgsIBbgjIcCCPySGytM9VcfhVKv1PDhCmG2AYRnJ8+pK9jREXkOyPhITuJbzR0v8
|
TgsIBbgjIcCCPySGytM9VcfhVKv1PDhCmG2AYRnJ8+pK9jREXkOyPhITuJbzR0v8
|
||||||
4mVvLiONe/1LO9mqN/+8orx06j5yrgrLbZ1tNHQ5HXVu8oPXjwVHF/eEnsoxE4zh
|
4mVvLiONe/1LO9mqN/+8orx06j5yrgrLbZ1tNHQ5HXVu8oPXjwVHF/eEnsoxE4zh
|
||||||
HohH3QFzB1V+ZFYSqzggWwjfldLDZFwIOg04/UStbf/AyDyuQMRpil/rJAvsq9f7
|
HohH3QFzB1V+ZFYSqzggWwjfldLDZFwIOg04/UStbf/AyDyuQMRpil/rJAvsq9f7
|
||||||
I2YQ3WJiPGN81TGpcGmv0xkE3GSxdw==
|
I2YQ3WJiPGN81TGpcGmv0xkE3GSxd5kBogRAy5zCEQQAjZbCZD0Xx+0TDp+54q72
|
||||||
=tc/c
|
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
|
||||||
|
bgTYNw==
|
||||||
|
=WLom
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xkbcomp
|
# spec file for package xkbcomp
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: xkbcomp
|
Name: xkbcomp
|
||||||
Version: 1.4.0
|
Version: 1.4.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utility to compile XKB keyboard description
|
Summary: Utility to compile XKB keyboard description
|
||||||
License: MIT
|
License: MIT
|
||||||
@ -26,7 +26,6 @@ Url: http://xorg.freedesktop.org/
|
|||||||
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
|
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
|
||||||
Source1: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2.sig
|
Source1: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2.sig
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
Patch0: U_xkbcomp_pkgconfig-add-bindir.patch
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: pkg-config
|
BuildRequires: pkg-config
|
||||||
BuildRequires: pkgconfig(x11)
|
BuildRequires: pkgconfig(x11)
|
||||||
@ -52,7 +51,6 @@ into one of several output formats.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
|
Loading…
Reference in New Issue
Block a user