From 90bd69286b5416766dde6459ce73224a1b8de8ec00b6ad86b6d5b6c83bdee0df Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 4 Sep 2015 10:04:31 +0000 Subject: [PATCH 1/2] Accepting request 327897 from home:MargueriteSu:branches:X11:Cinnamon:Factory OBS-URL: https://build.opensuse.org/request/show/327897 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=113 --- boo941629-unnessary-rpath-on-standard-path.patch | 15 +++++++++++++++ gettext-runtime-mini.changes | 8 ++++++++ gettext-runtime-mini.spec | 3 +++ gettext-runtime.changes | 8 ++++++++ gettext-runtime.spec | 3 +++ 5 files changed, 37 insertions(+) create mode 100644 boo941629-unnessary-rpath-on-standard-path.patch diff --git a/boo941629-unnessary-rpath-on-standard-path.patch b/boo941629-unnessary-rpath-on-standard-path.patch new file mode 100644 index 0000000..c95728d --- /dev/null +++ b/boo941629-unnessary-rpath-on-standard-path.patch @@ -0,0 +1,15 @@ +Index: gettext-0.19.5.1/build-aux/config.rpath +=================================================================== +--- gettext-0.19.5.1.orig/build-aux/config.rpath ++++ gettext-0.19.5.1/build-aux/config.rpath +@@ -216,7 +216,9 @@ if test "$with_gnu_ld" = yes; then + ;; + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- : ++ if $libdir == /usr/lib | $libdir == /usr/lib64; then ++ hardcode_libdir_flag_spec="" ++ fi + else + ld_shlibs=no + fi diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 171632d..2cbdfbb 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 24 15:37:36 UTC 2015 - i@marguerite.su + +- add patch: boo941649-unnessary-rpath-on-standard-path.patch + * config.rpath from gettext-tools will set rpath for ELF binaries + not in /usr/lib, even if it's the standard path the linker + would search anyway. + ------------------------------------------------------------------- Tue Jul 21 11:24:48 UTC 2015 - mlin@suse.com diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 3019d65..d1437bf 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -70,6 +70,8 @@ Patch6: gettext-dont-test-gnulib.patch Patch9: gettext-needlessly_init_vars.patch # PATCH-FIX-OPENSUSE gettext-0.19.5.1-gettextize.diff -- mlin@suse.com Patch10: gettext-0.19.5.1-gettextize.diff +# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com +Patch11: boo941629-unnessary-rpath-on-standard-path.patch %description This package contains the intl library as well as tools that ease the @@ -128,6 +130,7 @@ as well as project examples. %patch6 -p1 %patch9 %patch10 -p1 +%patch11 -p1 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." diff --git a/gettext-runtime.changes b/gettext-runtime.changes index a4cb69c..e0d5f76 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 24 15:35:02 UTC 2015 - i@marguerite.su + +- add patch: boo941649-unnessary-rpath-on-standard-path.patch + * config.rpath from gettext-tools will set rpath for ELF binaries + not in /usr/lib, even if it's the standard path the linker + would search anyway. + ------------------------------------------------------------------- Tue Jul 21 11:23:29 UTC 2015 - mlin@suse.com diff --git a/gettext-runtime.spec b/gettext-runtime.spec index c8aa597..6bcf396 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -70,6 +70,8 @@ Patch6: gettext-dont-test-gnulib.patch Patch9: gettext-needlessly_init_vars.patch # PATCH-FIX-OPENSUSE gettext-0.19.5.1-gettextize.diff -- mlin@suse.com Patch10: gettext-0.19.5.1-gettextize.diff +# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com +Patch11: boo941629-unnessary-rpath-on-standard-path.patch %description This package contains the intl library as well as tools that ease the @@ -128,6 +130,7 @@ as well as project examples. %patch6 -p1 %patch9 %patch10 -p1 +%patch11 -p1 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." From bcc93c69dffecb7c827c3e91a89cf6931c4272a9423ec3f1c84a8740c528fb10 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 4 Sep 2015 10:50:37 +0000 Subject: [PATCH 2/2] - add patch: boo941629-unnessary-rpath-on-standard-path.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=114 --- gettext-runtime.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gettext-runtime.changes b/gettext-runtime.changes index e0d5f76..bb212a8 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Aug 24 15:35:02 UTC 2015 - i@marguerite.su -- add patch: boo941649-unnessary-rpath-on-standard-path.patch +- add patch: boo941629-unnessary-rpath-on-standard-path.patch * config.rpath from gettext-tools will set rpath for ELF binaries not in /usr/lib, even if it's the standard path the linker would search anyway.