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
This commit is contained in:
Dirk Mueller 2019-12-20 08:23:39 +00:00 committed by Git OBS Bridge
parent bcca0187db
commit 1ea87b053e
7 changed files with 79 additions and 20 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 9 11:17:04 UTC 2019 - Christian Vögl <cvoegl@suse.de>
- Added -lm flag to CFLAGS
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 11 13:08:04 UTC 2019 - Christian Vögl <christian.voegl@suse.com> Tue Jun 11 13:08:04 UTC 2019 - Christian Vögl <christian.voegl@suse.com>

View File

@ -27,7 +27,7 @@ BuildRequires: mono-devel
BuildRequires: perl-libintl-perl BuildRequires: perl-libintl-perl
BuildRequires: tcl BuildRequires: tcl
Requires: mono Requires: mono
Url: http://www.gnu.org/software/gettext/ URL: http://www.gnu.org/software/gettext/
Version: 0.20.1 Version: 0.20.1
Release: 0 Release: 0
Summary: Native Language Support (NLS) for C# Summary: Native Language Support (NLS) for C#
@ -79,7 +79,7 @@ reliably than 'resgen'.
%patch5 %patch5
%build %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" export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
# expect a couple "You should update your `aclocal.m4' by running aclocal." # expect a couple "You should update your `aclocal.m4' by running aclocal."
#autoreconf -fiv #autoreconf -fiv

View File

@ -22,7 +22,7 @@ Release: 0
Summary: Java Support for Native Language Support (NLS) Summary: Java Support for Native Language Support (NLS)
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Tools/Other 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 Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el Source2: suse-start-po-mode.el

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Dec 17 10:16:04 UTC 2019 - Christian Vögl <cvoegl@suse.de>
- Add -lm to LDFLAGS (boo#1138806)
-------------------------------------------------------------------
Tue Nov 26 16:04:25 UTC 2019 - Christian Vögl <cvoegl@suse.de>
- 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 <stefan.bruens@rwth-aachen.de> Wed Oct 30 19:05:13 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -52,7 +52,7 @@ Provides: gettext-runtime = %{version}
Summary: Tools for Native Language Support (NLS) Summary: Tools for Native Language Support (NLS)
License: GPL-3.0-or-later AND LGPL-2.0-or-later License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other Group: Development/Tools/Other
Url: http://www.gnu.org/software/gettext/ URL: http://www.gnu.org/software/gettext/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc Source1: gettext-rpmlintrc
@ -86,6 +86,7 @@ Summary: Tools for Native Language Support (NLS)
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Tools/Other Group: Development/Tools/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: xz
%if %{without mini} %if %{without mini}
Requires(post): info Requires(post): info
Requires(preun): info Requires(preun): info
@ -127,6 +128,7 @@ BuildArch: noarch
This subpackage contains the HTML version of the gettext documentation This subpackage contains the HTML version of the gettext documentation
as well as project examples. as well as project examples.
%if %{without mini}
%package -n libtextstyle0 %package -n libtextstyle0
Summary: Provides textstyling for console output Summary: Provides textstyling for console output
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -147,7 +149,7 @@ Provides: libtextstyle-devel = %{version}
%description -n libtextstyle-devel %description -n libtextstyle-devel
This package provides headers and static libraries for libtextstyle This package provides headers and static libraries for libtextstyle
%endif
%prep %prep
%setup -q -n %{pacname}-%{version} %setup -q -n %{pacname}-%{version}
@ -163,8 +165,9 @@ This package provides headers and static libraries for libtextstyle
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
#sh autogen.sh #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 CXXFLAGS="$CFLAGS -Dgcc_is_lint"
export LDFLAGS="-lm"
%if 0%{?qemu_user_space_build:1} %if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp" OPTS="--disable-openmp"
%endif %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 %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar rm -f %_datadir/%name/gettext.jar
rm -f %{buildroot}/%_libdir/libtextstyle.la 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 #find %%{buildroot} -maxdepth 2 -name '*html' -delete
# hardlink the dupes in the documentation: # hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples cd %{buildroot}/%{my_docdir}/examples
@ -241,8 +253,10 @@ make check || {
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%if %{without mini}
%post -n libtextstyle0 -p /sbin/ldconfig %post -n libtextstyle0 -p /sbin/ldconfig
%postun -n libtextstyle0 -p /sbin/ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig
%endif
%files -f gettext-runtime.lang %files -f gettext-runtime.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -327,6 +341,7 @@ make check || {
%doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/xgettext*.html
%doc %_docdir/%name/recode-sr-latin.1.html %doc %_docdir/%name/recode-sr-latin.1.html
%if %{without mini}
%files -n libtextstyle0 %files -n libtextstyle0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libtextstyle.so.0 %_libdir/libtextstyle.so.0
@ -342,5 +357,6 @@ make check || {
%_libdir/libtextstyle.so %_libdir/libtextstyle.so
%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz %doc %_infodir/libtextstyle.info.gz
%endif
%changelog %changelog

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Dec 17 10:16:04 UTC 2019 - Christian Vögl <cvoegl@suse.de>
- Add -lm to LDFLAGS (boo#1138806)
-------------------------------------------------------------------
Tue Nov 26 16:04:25 UTC 2019 - Christian Vögl <cvoegl@suse.de>
- 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 <stefan.bruens@rwth-aachen.de> Wed Oct 30 19:05:13 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -52,7 +52,7 @@ Provides: gettext-runtime = %{version}
Summary: Tools for Native Language Support (NLS) Summary: Tools for Native Language Support (NLS)
License: GPL-3.0-or-later AND LGPL-2.0-or-later License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other Group: Development/Tools/Other
Url: http://www.gnu.org/software/gettext/ URL: http://www.gnu.org/software/gettext/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc Source1: gettext-rpmlintrc
@ -86,6 +86,7 @@ Summary: Tools for Native Language Support (NLS)
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
Group: Development/Tools/Other Group: Development/Tools/Other
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: xz
%if %{without mini} %if %{without mini}
Requires(post): info Requires(post): info
Requires(preun): info Requires(preun): info
@ -127,6 +128,7 @@ BuildArch: noarch
This subpackage contains the HTML version of the gettext documentation This subpackage contains the HTML version of the gettext documentation
as well as project examples. as well as project examples.
%if %{without mini}
%package -n libtextstyle0 %package -n libtextstyle0
Summary: Provides textstyling for console output Summary: Provides textstyling for console output
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -147,7 +149,7 @@ Provides: libtextstyle-devel = %{version}
%description -n libtextstyle-devel %description -n libtextstyle-devel
This package provides headers and static libraries for libtextstyle This package provides headers and static libraries for libtextstyle
%endif
%prep %prep
%setup -q -n %{pacname}-%{version} %setup -q -n %{pacname}-%{version}
@ -163,8 +165,9 @@ This package provides headers and static libraries for libtextstyle
%build %build
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
#sh autogen.sh #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 CXXFLAGS="$CFLAGS -Dgcc_is_lint"
export LDFLAGS="-lm"
%if 0%{?qemu_user_space_build:1} %if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp" OPTS="--disable-openmp"
%endif %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 %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar rm -f %_datadir/%name/gettext.jar
rm -f %{buildroot}/%_libdir/libtextstyle.la 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 #find %%{buildroot} -maxdepth 2 -name '*html' -delete
# hardlink the dupes in the documentation: # hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples cd %{buildroot}/%{my_docdir}/examples
@ -241,8 +253,10 @@ make check || {
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%if %{without mini}
%post -n libtextstyle0 -p /sbin/ldconfig %post -n libtextstyle0 -p /sbin/ldconfig
%postun -n libtextstyle0 -p /sbin/ldconfig %postun -n libtextstyle0 -p /sbin/ldconfig
%endif
%files -f gettext-runtime.lang %files -f gettext-runtime.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -327,6 +341,7 @@ make check || {
%doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/xgettext*.html
%doc %_docdir/%name/recode-sr-latin.1.html %doc %_docdir/%name/recode-sr-latin.1.html
%if %{without mini}
%files -n libtextstyle0 %files -n libtextstyle0
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/libtextstyle.so.0 %_libdir/libtextstyle.so.0
@ -342,5 +357,6 @@ make check || {
%_libdir/libtextstyle.so %_libdir/libtextstyle.so
%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html %doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
%doc %_infodir/libtextstyle.info.gz %doc %_infodir/libtextstyle.info.gz
%endif
%changelog %changelog