From c0a72cc43e198ff2ca2b02c5244e759520b14be6e2b7427801db1049c419164f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 5 Mar 2018 15:08:56 +0000 Subject: [PATCH] - 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/package/show/X11:XOrg/xkbcomp?expand=0&rev=19 --- U_xkbcomp_pkgconfig-add-bindir.patch | 20 ----------- xkbcomp-1.4.0.tar.bz2 | 3 -- xkbcomp-1.4.0.tar.bz2.sig | Bin 566 -> 0 bytes xkbcomp-1.4.1.tar.bz2 | 3 ++ xkbcomp-1.4.1.tar.bz2.sig | Bin 0 -> 95 bytes xkbcomp.changes | 16 +++++++++ xkbcomp.keyring | 48 +++++++++++++++++++++++++-- xkbcomp.spec | 6 ++-- 8 files changed, 67 insertions(+), 29 deletions(-) delete mode 100644 U_xkbcomp_pkgconfig-add-bindir.patch delete mode 100644 xkbcomp-1.4.0.tar.bz2 delete mode 100644 xkbcomp-1.4.0.tar.bz2.sig create mode 100644 xkbcomp-1.4.1.tar.bz2 create mode 100644 xkbcomp-1.4.1.tar.bz2.sig diff --git a/U_xkbcomp_pkgconfig-add-bindir.patch b/U_xkbcomp_pkgconfig-add-bindir.patch deleted file mode 100644 index 5059bae..0000000 --- a/U_xkbcomp_pkgconfig-add-bindir.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 6 Nov 2017 12:54:41 -0500 -Subject: pkgconfig: Add our bindir to xkbcomp.pc - -Reviewed-by: Daniel Stone -Signed-off-by: Adam Jackson - -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 diff --git a/xkbcomp-1.4.0.tar.bz2 b/xkbcomp-1.4.0.tar.bz2 deleted file mode 100644 index 330a767..0000000 --- a/xkbcomp-1.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b -size 243774 diff --git a/xkbcomp-1.4.0.tar.bz2.sig b/xkbcomp-1.4.0.tar.bz2.sig deleted file mode 100644 index b2d3f284c5025b32449f528670a89b5d4fb947bca04740a2e007fc57652acb0e..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+tZGc~VlPR>t*e7Sq#PENtWFG$o0$B%7g#Zc(5X{8z zf2?F4|LCC)|9X0{K!0ZFR{t?D`odtU$ixqC7f|U#UM2>$S8Q#_IlxqoV9J!BGy&rv z4?_S+_cW8WUhCx8jJz!`d`^W|ph;I}Kn4Vc0`XXuQdd2+{e3t@7p~AU2`)SGe}m*u z(M7)C;k;$EGA>*zkptbr>&L{zG7oy7AlmKnS#+z#1tzmJ3Aon{Tq|o&fvL|0S|_ZY zI~S;Z7kecn!SLT=deTu9{G8# zGfDtohNAgWgL;+LG22dF8n-1L`^suFFk-W5u}BOR*({x3-1%KObsIqxzS!-y;z6EE zlY?GUk+Y49yFL2FIn!aE6%>d znx*a7DFboPFN)@W7pJY7!lO-cQ;#C%2!c#huaY44u?9KXlzlUa)HoNTSH>M8oXl-I znk?yxXvsrPsIL63?FF-*TW;YN54%-!=*iR}6rxC!ZneHj9@rLvtLApc?@O6IPROlP Ei094{_y7O^ diff --git a/xkbcomp-1.4.1.tar.bz2 b/xkbcomp-1.4.1.tar.bz2 new file mode 100644 index 0000000..deab07a --- /dev/null +++ b/xkbcomp-1.4.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:748dc4cf58ac95684106bd9cf163ac6ab7de9a236faec02a6f4d4006d63a5736 +size 251069 diff --git a/xkbcomp-1.4.1.tar.bz2.sig b/xkbcomp-1.4.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..bfcdd336ac3bc5d2f23b63fe0141ce57e491bde77861027af869621de39dc7d7 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WVve*X4TcC5?m`k;YoCtZoq;!7cR3hMa{51&cMYf028?o#js$N vh)`GJC;vIW4QI;nuW)&8;CoP>VScHs;@7FH3$*7gyVdvB*(`X$WGyQIg*zqt literal 0 HcmV?d00001 diff --git a/xkbcomp.changes b/xkbcomp.changes index 3a76984..ab01ae6 100644 --- a/xkbcomp.changes +++ b/xkbcomp.changes @@ -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 diff --git a/xkbcomp.keyring b/xkbcomp.keyring index ebfe5dc..3507b57 100644 --- a/xkbcomp.keyring +++ b/xkbcomp.keyring @@ -7,6 +7,14 @@ uid [ unknown] Daniel Stone uid [ unknown] Daniel Stone sub 4096R/2BD34171 2017-01-09 +pub 1024D/A0ECD0D3 2004-06-13 [expires: 2015-11-01] +uid [ expired] Adam Jackson +uid [ expired] Adam Jackson +uid [ expired] Adam Jackson +uid [ expired] Adam Jackson +uid [ expired] Adam Jackson +sub 2048g/0CC0F663 2004-06-13 [expires: never ] + -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 @@ -87,6 +95,42 @@ WNEay/Emvv65lDOhmqyOC2VUgM+EXnFvkUvPeeNJ3c8Mtrn+Bgw5LMyZrfCB6ocF TgsIBbgjIcCCPySGytM9VcfhVKv1PDhCmG2AYRnJ8+pK9jREXkOyPhITuJbzR0v8 4mVvLiONe/1LO9mqN/+8orx06j5yrgrLbZ1tNHQ5HXVu8oPXjwVHF/eEnsoxE4zh HohH3QFzB1V+ZFYSqzggWwjfldLDZFwIOg04/UStbf/AyDyuQMRpil/rJAvsq9f7 -I2YQ3WJiPGN81TGpcGmv0xkE3GSxdw== -=tc/c +I2YQ3WJiPGN81TGpcGmv0xkE3GSxd5kBogRAy5zCEQQAjZbCZD0Xx+0TDp+54q72 +DeUrSlb8HSWtjBVDN7I6GgNdZ1vmcGMYqJ+BpGyDrc9uUdvU3MLgGitVFoctUc+m +iDjjDswXlDRhgr0Vxe+qyhwRznUicAFxLzWv/ayjiGjy+zwTey2+Apq4xGwPYCmL +WUA/akEinAMMssbM5FtXu08AoOzG1QauTFpQE4zgM1y6EqYMhDcDA/4z8+dypsFK +G26q4tqRYaM2nJeTfd3Mu296cKU2WHzOdHF1UkrIWKanQq+QKFhvw1zRkYsb9Q5w +SjiNgr+mAEC57XAEx8UfLLHpjmR0b+w9Ib1sAt6OhkinYNK0jrUR3w4RC+CBVZjy +2WlyEQ2dP2p3KwrkD3WfZswovy0JlZ6E3gP5Ae98yTGB+2dE0ir+PdADFkB2ylb6 +LPPrV8QE5atDrYm/rOeS10KHEj44KRkeais6k5/XpYNncqOBmHgGLxgZoULQXXmK +Na1atqQuhwszBu/c6My/TtuUpwy6Y1qKiQeqhwQHfbZUx85Ecb9Raq+I3yLqTW6K +124UdubYmDpu9oq0HEFkYW0gSmFja3NvbiA8YWpheEBud25rLm5ldD6IZAQTEQIA +JAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUCVi5iBAUJFWqaPgAKCRBbii1QoOzQ +04OKAJ4woiz5hjVmeVEfltmOrAj5Tgx98gCfTNzo3pJYF9dRqFVaBfqij2kfSFq0 +HkFkYW0gSmFja3NvbiA8YWpheEByZWRoYXQuY29tPohmBBMRAgAmAhsDBgsJCAcD +AgQVAggDBBYCAwECHgECF4AFAlYuYgQFCRVqmj4ACgkQW4otUKDs0NN7+wCcCWC+ +6LZbsmtuj+96aMXAwbDWb5QAniFsVcjRqfe9xEmx6k+mBrNw6/optCBBZGFtIEph +Y2tzb24gPGFqYXhAZW5nci5zZ2kuY29tPohkBBMRAgAkAhsDBgsJCAcDAgMVAgMD +FgIBAh4BAheABQJWLmIEBQkVapo+AAoJEFuKLVCg7NDTyXEAnRYEYAqmd7kHliye +q7BH6xxyNHDQAJ4r774k/Ml4p/uDTR0beQjxQQW1MrQmQWRhbSBKYWNrc29uIDxh +amF4QHdpbGRvcGVuc291cmNlLmNvbT6IZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYC +AQIeAQIXgAUCVi5iBAUJFWqaPgAKCRBbii1QoOzQ05abAJ4wZyyEcx6EB3pwjFvl +slamEUz8swCfd+vrN1ql195JKyPVemtYr5ciZCW0J0FkYW0gSmFja3NvbiA8YWph +eEBiZW56ZWRyaW5lLm53bmsubmV0PohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIB +Ah4BAheABQJWLmIEBQkVapo+AAoJEFuKLVCg7NDTRpgAoOdKyuIP4UulqnJa7Pa9 +GBdoXNyFAJ0T5VBrCvowJ3F2Gt56FEP+OVmGwrkCDQRAy5zQEAgAq27td1WbIoLD +OvDM33RkOMf2nDuFXfg4P2hY9xIT312R0Wrrie4ELVnPTJNoIU426hF49CSC24n/ +eSMkoXQv38RGIhcm0Tg0ehR5V4+gRQsWRX6ouJjrmhkOAXgee4P4FvhUqCD82FOC +GPOSg+tqnkt+80BAQACvpghG6FBnz09MB65BbZEzm4zoO1E46Qaefx5J1ERGKPJi +6Fgb+wg5QKYnJl6KpynwHBWjWNmCzI5JcBR4dotvunT25HVkhKbmYZMSEP/CZWEu +gNoOQzCnDXZqq+GesY5PBY9UjuyC3PRLUfgAqpKpJpVN5uAFB43Uf+JJO7RCeQ8r +T3PeSXLiZwADBQf/SllKiW3Xh7OOyyQZLGerZxwK3Ehuud3vbno7TbecariSM9sM +W3sTFfQZM8Lvb/wPFaO6cewZIYfvrAa4KRg+M+Sa/j2ljrMOaqzvTlVYM15FH9kK +A4MOB4fJvY6cdbOrTWrD7MtdjhjCeGuWtRghoPBe7D5ViwXePdb4mrw8jlmJCqMy +x4V8CpRjnnNLAkRnh04qj4p8bNvT12kxOw5f39nWIIjc00lnrUse0r9R/RF+KsT4 +HLJnUbhle5O3SMPydNq3CPzpeDlDkUTGNnICZ2+ZjcSMU4ExicrJvjI3z62Zzng1 +Sk66AGLWrP7oq6ojc5O33SHVHYGzobAJfZ90GYhGBBgRAgAGBQJAy5zQAAoJEFuK +LVCg7NDT9wgAoIzsNFX2JHbTCLOfH9K4xvm/9E2LAKCZBlMa8X2LtbNKO3WCWGbX +bgTYNw== +=WLom -----END PGP PUBLIC KEY BLOCK----- diff --git a/xkbcomp.spec b/xkbcomp.spec index 695fb08..5b0bfc9 100644 --- a/xkbcomp.spec +++ b/xkbcomp.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xkbcomp -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: Utility to compile XKB keyboard description License: MIT @@ -26,7 +26,6 @@ Url: http://xorg.freedesktop.org/ 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 Source2: %{name}.keyring -Patch0: U_xkbcomp_pkgconfig-add-bindir.patch BuildRequires: bison BuildRequires: pkg-config BuildRequires: pkgconfig(x11) @@ -52,7 +51,6 @@ into one of several output formats. %prep %setup -q -%patch0 -p1 %build %configure