From 5de50d223de16b70ce5f88b0579176e97c9b21ffc848481d1531a0f4a8e9c952 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 12 Jan 2012 15:07:04 +0000 Subject: [PATCH 1/2] Accepting request 100036 from home:a_jaeger:FactoryFix Remove cvs, not used in build. OBS-URL: https://build.opensuse.org/request/show/100036 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=53 --- gettext-csharp.spec | 4 ++-- gettext-java.spec | 4 ++-- gettext-runtime.changes | 5 +++++ gettext-runtime.spec | 8 ++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gettext-csharp.spec b/gettext-csharp.spec index ddfb5f9..9cc6b41 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -1,7 +1,7 @@ # # spec file for package gettext-csharp # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ BuildRequires: fdupes mono-devel perl-libintl-perl tcl BuildRequires: libtool Requires: mono Url: http://www.gnu.org/software/gettext/ -License: LGPLv2.1+ +License: LGPL-2.1+ Group: Development/Tools/Other AutoReqProv: on Version: 0.18.1.1 diff --git a/gettext-java.spec b/gettext-java.spec index be5c51f..849ae7c 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -1,7 +1,7 @@ # # spec file for package gettext-java # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: gettext-java BuildRequires: fdupes gcc-c++ gcc-java perl-libintl-perl tcl BuildRequires: libtool Url: http://www.gnu.org/software/gettext/ -License: LGPLv2.1+ +License: LGPL-2.1+ Group: Development/Tools/Other AutoReqProv: on Version: 0.18.1.1 diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 2996f25..5a6b773 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 12 13:37:28 UTC 2012 - aj@suse.de + +- Remove cvs, not used anymore since 0.18.1 in our build. + ------------------------------------------------------------------- Sun Oct 2 14:24:27 CEST 2011 - dmueller@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index f96a904..55a46a0 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -1,7 +1,7 @@ # # spec file for package gettext-runtime # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ BuildRequires: libtool # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable: #BuildRequires: fdupes Url: http://www.gnu.org/software/gettext/ -License: GPLv3+ ; LGPLv2.0+ +License: GPL-3.0+ ; LGPL-2.0+ Group: Development/Tools/Other # bug437293 %ifarch ppc64 @@ -70,10 +70,10 @@ Authors: Bruno Haible %package -n gettext-tools -License: LGPLv2.1+ +License: LGPL-2.1+ Summary: Tools for Native Language Support (NLS) Group: Development/Tools/Other -Requires: %{name} = %{version}, cvs +Requires: %{name} = %{version} PreReq: info # bug437293 %ifarch ppc64 From 80108a146a1e28f6529ff4b0181b114b63a0f79bbe79af603205c92a781cd11f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 13 Jan 2012 13:23:34 +0000 Subject: [PATCH 2/2] Accepting request 100077 from home:a_jaeger:FactoryFix Disable randomly failing tests. OBS-URL: https://build.opensuse.org/request/show/100077 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=54 --- gettext-runtime.changes | 6 ++++++ gettext-runtime.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 5a6b773..cdff0d4 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 12 15:57:24 UTC 2012 - aj@suse.de + +- Disable tests test-readlink and test-areadlink since they + fail randomly. + ------------------------------------------------------------------- Thu Jan 12 13:37:28 UTC 2012 - aj@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 55a46a0..29a5642 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -119,7 +119,6 @@ export CXXFLAGS="$CFLAGS -Dgcc_is_lint" OPTS="--disable-openmp" %endif %configure --enable-shared $OPTS - make %{?_smp_mflags} GMSGFMT=../src/msgfmt # use texinfo.tex supplied by the system (texinfo) # make -C gettext-tools/doc gettext.pdf @@ -160,6 +159,11 @@ echo ".so man3/dgettext.3" > dcgettext.3 # s390s fails this test, # Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed. +# These fails randomly, remove them from Makefile +sed -i -e 's/test-areadlink\$(EXEEXT) //g' \ + -e 's/test-readlink\$(EXEEXT) //g' \ + gettext-tools/gnulib-tests/Makefile + make check || { %ifarch s390x echo "got this during mbuild testing on s390x (on both times which make check ran):"