Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at 2018-03-31 15:35:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2 (Old) and /work/SRC/openSUSE:Factory/.gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2" Sat Mar 31 15:35:43 2018 rev:167 rq:592045 version:2.24.32 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2/gtk2.changes 2018-03-26 12:43:57.066718939 +0200 +++ /work/SRC/openSUSE:Factory/.gtk2.new/gtk2.changes 2018-03-31 15:35:48.540034870 +0200 @@ -1,0 +2,6 @@ +Tue Mar 27 14:29:49 UTC 2018 - [email protected] + +- Add 0001-build-support-automake-1.16.patch: Support automake + 1.16. + +------------------------------------------------------------------- New: ---- 0001-build-support-automake-1.16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.n6NKE7/_old 2018-03-31 15:35:51.383931755 +0200 +++ /var/tmp/diff_new_pack.n6NKE7/_new 2018-03-31 15:35:51.387931610 +0200 @@ -51,6 +51,8 @@ Patch7: gtk2-converter-python3.patch # PATCH-FEATURE-OPENSUSE gtk2-updateiconcache_sort.patch [email protected] -- Have gtp-update-icon-cache sort the file list before producing a cache Patch8: gtk2-updateiconcache_sort.patch +# PATCH-FIX-UPSTREAM 0001-build-support-automake-1.16.patch [email protected] -- Support automake 1.16 +Patch9: 0001-build-support-automake-1.16.patch BuildRequires: atk-devel BuildRequires: cairo-devel BuildRequires: cups-devel @@ -326,6 +328,7 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 gnome-patch-translation-update %build ++++++ 0001-build-support-automake-1.16.patch ++++++ >From 2dbf31c0ea4f17a817b931c731f8de14c278300d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Tue, 27 Mar 2018 16:24:02 +0200 Subject: [PATCH] build: support automake 1.16 --- autogen.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index 078f483f5a..63e2d5c495 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,7 +48,10 @@ fi DIE=1 } -if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then +if automake-1.16 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE=automake-1.16 + ACLOCAL=aclocal-1.16 +else if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then @@ -71,8 +74,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then ACLOCAL=aclocal-1.7 else echo - echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x" - echo "or 1.15.x installed to compile $PROJECT." + echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x," + echo "1.15.x or 1.16.x installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"; DIE=1 @@ -83,6 +86,7 @@ fi fi fi fi +fi if test "$DIE" -eq 1; then exit 1 -- 2.16.2
