diff --git a/gettext-dont-test-gnulib.patch b/gettext-dont-test-gnulib.patch new file mode 100644 index 0000000..7a5a1bc --- /dev/null +++ b/gettext-dont-test-gnulib.patch @@ -0,0 +1,29 @@ +Subject: This is not gnulib, so don't test it +From: Stephan Kulow + +Index: gettext-0.18.3.1/gettext-tools/Makefile.am +=================================================================== +--- gettext-0.18.3.1.orig/gettext-tools/Makefile.am ++++ gettext-0.18.3.1/gettext-tools/Makefile.am +@@ -19,7 +19,7 @@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 + +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples ++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples + + EXTRA_DIST = misc/DISCLAIM + MOSTLYCLEANFILES = core *.stackdump +Index: gettext-0.18.3.1/gettext-tools/Makefile.in +=================================================================== +--- gettext-0.18.3.1.orig/gettext-tools/Makefile.in ++++ gettext-0.18.3.1/gettext-tools/Makefile.in +@@ -1551,7 +1551,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 +-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples ++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples + + # Allow users to use "gnulib-tool --update". + diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index ebb05be..5bde151 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 24 08:59:10 UTC 2013 - coolo@suse.com + +- avoid testing gnulib copies - we're not interested in bugs in gnulib + as we don't use it + ------------------------------------------------------------------- Sun Oct 20 11:01:11 UTC 2013 - jengelh@inai.de diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 1436b79..65e64f9 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -61,6 +61,8 @@ Patch: gettext-0.12.1-sigfpe.patch Patch2: gettext-0.12.1-gettextize.patch Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch +# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de +Patch6: gettext-dont-test-gnulib.patch Patch9: gettext-needlessly_init_vars.patch %description @@ -116,6 +118,7 @@ as well as project examples. %patch2 %patch4 %patch5 +%patch6 -p1 %patch9 %build diff --git a/gettext-runtime.changes b/gettext-runtime.changes index ebb05be..5bde151 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 24 08:59:10 UTC 2013 - coolo@suse.com + +- avoid testing gnulib copies - we're not interested in bugs in gnulib + as we don't use it + ------------------------------------------------------------------- Sun Oct 20 11:01:11 UTC 2013 - jengelh@inai.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index c01ef7d..10773b6 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -61,6 +61,8 @@ Patch: gettext-0.12.1-sigfpe.patch Patch2: gettext-0.12.1-gettextize.patch Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch +# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de +Patch6: gettext-dont-test-gnulib.patch Patch9: gettext-needlessly_init_vars.patch %description @@ -116,6 +118,7 @@ as well as project examples. %patch2 %patch4 %patch5 +%patch6 -p1 %patch9 %build