From 1ea87b053eb78517f7dd2b3b8cd513692d3f0dee1ecfae260eccf44272669302 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 20 Dec 2019 08:23:39 +0000 Subject: [PATCH] Accepting request 757570 from home:cvoegl:branches:Base:System moved -lm to LDFLAGS OBS-URL: https://build.opensuse.org/request/show/757570 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=159 --- gettext-csharp.changes | 5 +++++ gettext-csharp.spec | 6 +++--- gettext-java.spec | 2 +- gettext-runtime-mini.changes | 11 +++++++++++ gettext-runtime-mini.spec | 32 ++++++++++++++++++++++++-------- gettext-runtime.changes | 11 +++++++++++ gettext-runtime.spec | 32 ++++++++++++++++++++++++-------- 7 files changed, 79 insertions(+), 20 deletions(-) diff --git a/gettext-csharp.changes b/gettext-csharp.changes index 02a6de7..e14e73e 100644 --- a/gettext-csharp.changes +++ b/gettext-csharp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 9 11:17:04 UTC 2019 - Christian Vögl + +- Added -lm flag to CFLAGS + ------------------------------------------------------------------- Tue Jun 11 13:08:04 UTC 2019 - Christian Vögl diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 21f2724..50ed4f9 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -27,7 +27,7 @@ BuildRequires: mono-devel BuildRequires: perl-libintl-perl BuildRequires: tcl Requires: mono -Url: http://www.gnu.org/software/gettext/ +URL: http://www.gnu.org/software/gettext/ Version: 0.20.1 Release: 0 Summary: Native Language Support (NLS) for C# @@ -79,12 +79,12 @@ reliably than 'resgen'. %patch5 %build -export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint -lm" export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" # expect a couple "You should update your `aclocal.m4' by running aclocal." #autoreconf -fiv #sh autogen.sh -%configure --enable-shared --enable-csharp +%configure --enable-shared --enable-csharp make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1 %install diff --git a/gettext-java.spec b/gettext-java.spec index 838382c..560ff94 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Java Support for Native Language Support (NLS) License: LGPL-2.1-or-later Group: Development/Tools/Other -Url: http://www.gnu.org/software/gettext/ +URL: http://www.gnu.org/software/gettext/ Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz Source1: gettext-rpmlintrc Source2: suse-start-po-mode.el diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 633ce2b..0ab0192 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Dec 17 10:16:04 UTC 2019 - Christian Vögl + +- Add -lm to LDFLAGS (boo#1138806) + +------------------------------------------------------------------- +Tue Nov 26 16:04:25 UTC 2019 - Christian Vögl + +- Added xz to requires (boo#1141380) +- The previous update to 0.20.1 also fixes (boo#1113719) + ------------------------------------------------------------------- Wed Oct 30 19:05:13 UTC 2019 - Stefan Brüns diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 246e5e9..1bbbb23 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -52,7 +52,7 @@ Provides: gettext-runtime = %{version} Summary: Tools for Native Language Support (NLS) License: GPL-3.0-or-later AND LGPL-2.0-or-later Group: Development/Tools/Other -Url: http://www.gnu.org/software/gettext/ +URL: http://www.gnu.org/software/gettext/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz Source1: gettext-rpmlintrc @@ -66,11 +66,11 @@ Patch1: gettext-0.19.3-fix-bashisms.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 +# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de Patch6: gettext-dont-test-gnulib.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch -# PATCH-FIX-SUSE Bug boo#1106843 +# PATCH-FIX-SUSE Bug boo#1106843 Patch13: reproducible.patch %description @@ -86,6 +86,7 @@ Summary: Tools for Native Language Support (NLS) License: LGPL-2.1-or-later Group: Development/Tools/Other Requires: %{name} = %{version} +Requires: xz %if %{without mini} Requires(post): info Requires(preun): info @@ -127,14 +128,15 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. +%if %{without mini} %package -n libtextstyle0 Summary: Provides textstyling for console output License: LGPL-2.1-or-later Group: Development/Tools/Other %description -n libtextstyle0 -GNU libtextstyle provides an easy way to add styling to programs that produce output to a console or terminal emulator window. -It does this in a way that allows the end user to customize the styling using the industry standard, namely Cascading Style Sheets (CSS). +GNU libtextstyle provides an easy way to add styling to programs that produce output to a console or terminal emulator window. +It does this in a way that allows the end user to customize the styling using the industry standard, namely Cascading Style Sheets (CSS). @@ -147,7 +149,7 @@ Provides: libtextstyle-devel = %{version} %description -n libtextstyle-devel This package provides headers and static libraries for libtextstyle - +%endif %prep %setup -q -n %{pacname}-%{version} @@ -163,8 +165,9 @@ This package provides headers and static libraries for libtextstyle %build %define _lto_cflags %{nil} #sh autogen.sh -export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint -lm" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="$CFLAGS -Dgcc_is_lint" +export LDFLAGS="-lm" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" %endif @@ -195,6 +198,15 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %_datadir/%name/gettext.jar rm -f %{buildroot}/%_libdir/libtextstyle.la +%if %{with mini} + rm -f %{buildroot}/usr/include/textstyle.h + rm -rf %{buildroot}/usr/include/textstyle + rm -rf %{buildroot}/usr/share/doc/packages/gettext-runtime-mini/libtextstyle_*.html + rm -rf %{buildroot}/usr/lib/debug/%_libdir/libtextstyle.so.0.0.0-0* + rm -rf %{buildroot}/%_libdir/libtextstyle.so.* + rm -f %{buildroot}/%_libdir/libtextstyle.so + rm -f %{buildroot}/%{_infodir}/libtextstyle.info +%endif #find %%{buildroot} -maxdepth 2 -name '*html' -delete # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples @@ -209,7 +221,7 @@ echo ".so man3/dgettext.3" > dcgettext.3 %if %{without mini} %check -# s390s fails this test, +# 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 @@ -241,8 +253,10 @@ make check || { %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz +%if %{without mini} %post -n libtextstyle0 -p /sbin/ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig +%endif %files -f gettext-runtime.lang %defattr(-,root,root) @@ -327,6 +341,7 @@ make check || { %doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/recode-sr-latin.1.html +%if %{without mini} %files -n libtextstyle0 %defattr(-,root,root) %_libdir/libtextstyle.so.0 @@ -342,5 +357,6 @@ make check || { %_libdir/libtextstyle.so %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html %doc %_infodir/libtextstyle.info.gz +%endif %changelog diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 633ce2b..0ab0192 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Dec 17 10:16:04 UTC 2019 - Christian Vögl + +- Add -lm to LDFLAGS (boo#1138806) + +------------------------------------------------------------------- +Tue Nov 26 16:04:25 UTC 2019 - Christian Vögl + +- Added xz to requires (boo#1141380) +- The previous update to 0.20.1 also fixes (boo#1113719) + ------------------------------------------------------------------- Wed Oct 30 19:05:13 UTC 2019 - Stefan Brüns diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 3a6c053..b18d5e1 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -52,7 +52,7 @@ Provides: gettext-runtime = %{version} Summary: Tools for Native Language Support (NLS) License: GPL-3.0-or-later AND LGPL-2.0-or-later Group: Development/Tools/Other -Url: http://www.gnu.org/software/gettext/ +URL: http://www.gnu.org/software/gettext/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz Source1: gettext-rpmlintrc @@ -66,11 +66,11 @@ Patch1: gettext-0.19.3-fix-bashisms.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 +# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de Patch6: gettext-dont-test-gnulib.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch -# PATCH-FIX-SUSE Bug boo#1106843 +# PATCH-FIX-SUSE Bug boo#1106843 Patch13: reproducible.patch %description @@ -86,6 +86,7 @@ Summary: Tools for Native Language Support (NLS) License: LGPL-2.1-or-later Group: Development/Tools/Other Requires: %{name} = %{version} +Requires: xz %if %{without mini} Requires(post): info Requires(preun): info @@ -127,14 +128,15 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. +%if %{without mini} %package -n libtextstyle0 Summary: Provides textstyling for console output License: LGPL-2.1-or-later Group: Development/Tools/Other %description -n libtextstyle0 -GNU libtextstyle provides an easy way to add styling to programs that produce output to a console or terminal emulator window. -It does this in a way that allows the end user to customize the styling using the industry standard, namely Cascading Style Sheets (CSS). +GNU libtextstyle provides an easy way to add styling to programs that produce output to a console or terminal emulator window. +It does this in a way that allows the end user to customize the styling using the industry standard, namely Cascading Style Sheets (CSS). @@ -147,7 +149,7 @@ Provides: libtextstyle-devel = %{version} %description -n libtextstyle-devel This package provides headers and static libraries for libtextstyle - +%endif %prep %setup -q -n %{pacname}-%{version} @@ -163,8 +165,9 @@ This package provides headers and static libraries for libtextstyle %build %define _lto_cflags %{nil} #sh autogen.sh -export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint -lm" +export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" export CXXFLAGS="$CFLAGS -Dgcc_is_lint" +export LDFLAGS="-lm" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" %endif @@ -195,6 +198,15 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32} rm -f %_datadir/%name/gettext.jar rm -f %{buildroot}/%_libdir/libtextstyle.la +%if %{with mini} + rm -f %{buildroot}/usr/include/textstyle.h + rm -rf %{buildroot}/usr/include/textstyle + rm -rf %{buildroot}/usr/share/doc/packages/gettext-runtime-mini/libtextstyle_*.html + rm -rf %{buildroot}/usr/lib/debug/%_libdir/libtextstyle.so.0.0.0-0* + rm -rf %{buildroot}/%_libdir/libtextstyle.so.* + rm -f %{buildroot}/%_libdir/libtextstyle.so + rm -f %{buildroot}/%{_infodir}/libtextstyle.info +%endif #find %%{buildroot} -maxdepth 2 -name '*html' -delete # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples @@ -209,7 +221,7 @@ echo ".so man3/dgettext.3" > dcgettext.3 %if %{without mini} %check -# s390s fails this test, +# 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 @@ -241,8 +253,10 @@ make check || { %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz +%if %{without mini} %post -n libtextstyle0 -p /sbin/ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig +%endif %files -f gettext-runtime.lang %defattr(-,root,root) @@ -327,6 +341,7 @@ make check || { %doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/recode-sr-latin.1.html +%if %{without mini} %files -n libtextstyle0 %defattr(-,root,root) %_libdir/libtextstyle.so.0 @@ -342,5 +357,6 @@ make check || { %_libdir/libtextstyle.so %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html %doc %_infodir/libtextstyle.info.gz +%endif %changelog