From f5f1b3d8d7414535194754b749744745c086e105c54020cf412a65232d569d4c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 30 Sep 2020 09:05:56 +0000 Subject: [PATCH] Accepting request 838715 from home:dimstar:Factory - Add xtrans-noarch-pkgconfig.patch: Do not add libdir=/usr(lib|lib64) entry to an arch-independent pkgconfig file (installed to /usr/share) (boo#1109895). OBS-URL: https://build.opensuse.org/request/show/838715 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xtrans?expand=0&rev=25 --- xtrans-noarch-pkgconfig.patch | 11 +++++++++++ xtrans.changes | 7 +++++++ xtrans.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 xtrans-noarch-pkgconfig.patch diff --git a/xtrans-noarch-pkgconfig.patch b/xtrans-noarch-pkgconfig.patch new file mode 100644 index 0000000..e5ae266 --- /dev/null +++ b/xtrans-noarch-pkgconfig.patch @@ -0,0 +1,11 @@ +Index: xtrans-1.4.0/xtrans.pc.in +=================================================================== +--- xtrans-1.4.0.orig/xtrans.pc.in ++++ xtrans-1.4.0/xtrans.pc.in +@@ -1,6 +1,5 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-libdir=@libdir@ + includedir=@includedir@ + + Name: XTrans diff --git a/xtrans.changes b/xtrans.changes index 06cd3cb..8385fc9 100644 --- a/xtrans.changes +++ b/xtrans.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 30 08:49:47 UTC 2020 - Dominique Leuenberger + +- Add xtrans-noarch-pkgconfig.patch: Do not add + libdir=/usr(lib|lib64) entry to an arch-independent pkgconfig + file (installed to /usr/share) (boo#1109895). + ------------------------------------------------------------------- Thu Aug 8 10:59:38 UTC 2019 - Dominique Leuenberger diff --git a/xtrans.spec b/xtrans.spec index ab1c5e9..17bcff9 100644 --- a/xtrans.spec +++ b/xtrans.spec @@ -1,7 +1,7 @@ # # spec file for package xtrans # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ URL: https://xorg.freedesktop.org/ Source: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Patch0: p_xauth.diff Patch1: n_unifdef-LBXPROXY_t-and-TEST_t.patch +Patch2: xtrans-noarch-pkgconfig.patch BuildRequires: pkgconfig BuildRequires: pkgconfig(xorg-macros) >= 1.12 BuildRequires: pkgconfig(xshmfence) @@ -46,6 +47,7 @@ libX11, libICE, the X font server, and related components. %setup -q %patch0 %patch1 -p1 -R +%patch2 -p1 %build %configure --docdir=%{_docdir}/xtrans