Compare commits

...

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

7 changed files with 122 additions and 44 deletions

3
.gitignore vendored
View File

@ -1,2 +1 @@
SOURCES/gettext-0.19.7.tar.gz
/gettext-0.19.7.tar.gz
SOURCES/gettext-0.21.tar.xz

1
.mingw-gettext.metadata Normal file
View File

@ -0,0 +1 @@
9d75b47baed1a612c0120991c4b6d9cf95e0d430 SOURCES/gettext-0.21.tar.xz

View File

@ -0,0 +1,20 @@
diff -rupN --no-dereference gettext-0.21/gettext-runtime/intl/libgnuintl.in.h gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h
--- gettext-0.21/gettext-runtime/intl/libgnuintl.in.h 2020-07-26 22:13:34.000000000 +0200
+++ gettext-0.21-new/gettext-runtime/intl/libgnuintl.in.h 2020-08-03 11:57:20.495613456 +0200
@@ -431,6 +431,7 @@ extern int vasprintf (char **, const cha
#endif
#if @HAVE_WPRINTF@
+#ifndef __cplusplus
#undef fwprintf
#define fwprintf libintl_fwprintf
@@ -455,6 +456,8 @@ extern int vswprintf (wchar_t *, size_t,
#endif
+#endif
+
#endif

View File

@ -0,0 +1,11 @@
diff -rupN gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c
--- gettext-0.21/gettext-tools/woe32dll/gettextsrc-exports.c 2019-12-23 12:21:12.000000000 +0100
+++ gettext-0.21-new/gettext-tools/woe32dll/gettextsrc-exports.c 2020-08-03 14:22:17.096473605 +0200
@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
VARIABLE(formatstring_python_brace)
VARIABLE(formatstring_qt)
VARIABLE(formatstring_qt_plural)
+VARIABLE(formatstring_ruby)
VARIABLE(formatstring_scheme)
VARIABLE(formatstring_sh)
VARIABLE(formatstring_smalltalk)

View File

@ -1,18 +1,21 @@
%?mingw_package_header
%{?mingw_package_header}
Name: mingw-gettext
Version: 0.19.7
Version: 0.21
Release: 5%{?dist}
Summary: GNU libraries and utilities for producing multi-lingual messages
License: GPLv2+ and LGPLv2+
Group: Development/Libraries
License: GPL-2.0-or-later AND LGPL-2.0-or-later
URL: http://www.gnu.org/software/gettext/
Source0: http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.gz
Source0: https://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
# Don't override various *printf macros in C++, they collide with the std::xxx counterparts
Patch0: gettext-printf_collision.patch
# Add missing symbol export
Patch1: gettext_formatstring-ruby.patch
BuildArch: noarch
ExclusiveArch: %{ix86} x86_64
BuildRequires: make
BuildRequires: mingw32-filesystem >= 95
BuildRequires: mingw32-gcc
BuildRequires: mingw32-gcc-c++
@ -49,7 +52,6 @@ MinGW Windows Gettext library
%package -n mingw32-gettext-static
Summary: Static version of the MinGW Windows Gettext library
Requires: mingw32-gettext = %{version}-%{release}
Group: Development/Libraries
%description -n mingw32-gettext-static
Static version of the MinGW Windows Gettext library.
@ -64,18 +66,16 @@ MinGW Windows Gettext library
%package -n mingw64-gettext-static
Summary: Static version of the MinGW Windows Gettext library
Requires: mingw64-gettext = %{version}-%{release}
Group: Development/Libraries
%description -n mingw64-gettext-static
Static version of the MinGW Windows Gettext library.
%?mingw_debug_package
%{?mingw_debug_package}
%prep
%setup -q -n gettext-%{version}
%autosetup -p1 -n gettext-%{version}
%build
%mingw_configure \
@ -86,50 +86,51 @@ Static version of the MinGW Windows Gettext library.
--enable-threads=win32 \
--without-emacs \
--disable-openmp
%mingw_make %{?_smp_mflags}
%mingw_make_build
%install
%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
%mingw_make_install
rm -f $RPM_BUILD_ROOT%{mingw32_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/charset.alias
rm -f %{buildroot}%{mingw32_datadir}/locale/locale.alias
rm -f %{buildroot}%{mingw32_libdir}/charset.alias
rm -f $RPM_BUILD_ROOT%{mingw64_datadir}/locale/locale.alias
rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/charset.alias
rm -f %{buildroot}%{mingw64_datadir}/locale/locale.alias
rm -f %{buildroot}%{mingw64_libdir}/charset.alias
# Remove documentation - already available in base gettext-devel.
rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
rm -rf $RPM_BUILD_ROOT%{mingw32_infodir}
rm -rf %{buildroot}%{mingw32_mandir}
rm -rf %{buildroot}%{mingw32_docdir}
rm -rf %{buildroot}%{mingw32_infodir}
rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
rm -rf $RPM_BUILD_ROOT%{mingw64_docdir}
rm -rf $RPM_BUILD_ROOT%{mingw64_infodir}
rm -rf %{buildroot}%{mingw64_mandir}
rm -rf %{buildroot}%{mingw64_docdir}
rm -rf %{buildroot}%{mingw64_infodir}
# Drop some useless tools
rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gettext
rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/gettext
rm -rf %{buildroot}%{mingw32_libdir}/gettext
rm -rf %{buildroot}%{mingw64_libdir}/gettext
# Drop all .la files
find $RPM_BUILD_ROOT -name "*.la" -delete
find %{buildroot} -name "*.la" -delete
%mingw_find_lang %{name} --all-name
# Win32
%files -n mingw32-gettext -f mingw32-%{name}.lang
%doc COPYING
%license COPYING
%{mingw32_bindir}/autopoint
%{mingw32_bindir}/envsubst.exe
%{mingw32_bindir}/gettext.exe
%{mingw32_bindir}/gettext.sh
%{mingw32_bindir}/gettextize
%{mingw32_bindir}/libasprintf-0.dll
%{mingw32_bindir}/libgettextlib-0-19-7.dll
%{mingw32_bindir}/libgettextlib-0-21.dll
%{mingw32_bindir}/libgettextpo-0.dll
%{mingw32_bindir}/libgettextsrc-0-19-7.dll
%{mingw32_bindir}/libgettextsrc-0-21.dll
%{mingw32_bindir}/libintl-8.dll
%{mingw32_bindir}/libtextstyle-0.dll
%{mingw32_bindir}/msg*.exe
%{mingw32_bindir}/ngettext.exe
%{mingw32_bindir}/recode-sr-latin.exe
@ -137,11 +138,16 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_includedir}/autosprintf.h
%{mingw32_includedir}/gettext-po.h
%{mingw32_includedir}/libintl.h
%{mingw32_includedir}/textstyle.h
%{mingw32_includedir}/textstyle/stdbool.h
%{mingw32_includedir}/textstyle/version.h
%{mingw32_includedir}/textstyle/woe32dll.h
%{mingw32_libdir}/libasprintf.dll.a
%{mingw32_libdir}/libgettextlib.dll.a
%{mingw32_libdir}/libgettextpo.dll.a
%{mingw32_libdir}/libgettextsrc.dll.a
%{mingw32_libdir}/libintl.dll.a
%{mingw32_libdir}/libtextstyle.dll.a
%{mingw32_datadir}/gettext/
%{mingw32_datadir}/gettext-%{version}/
%{mingw32_datadir}/aclocal/*m4
@ -150,20 +156,22 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw32_libdir}/libasprintf.a
%{mingw32_libdir}/libgettextpo.a
%{mingw32_libdir}/libintl.a
%{mingw32_libdir}/libtextstyle.a
# Win64
%files -n mingw64-gettext -f mingw64-%{name}.lang
%doc COPYING
%license COPYING
%{mingw64_bindir}/autopoint
%{mingw64_bindir}/envsubst.exe
%{mingw64_bindir}/gettext.exe
%{mingw64_bindir}/gettext.sh
%{mingw64_bindir}/gettextize
%{mingw64_bindir}/libasprintf-0.dll
%{mingw64_bindir}/libgettextlib-0-19-7.dll
%{mingw64_bindir}/libgettextlib-0-21.dll
%{mingw64_bindir}/libgettextpo-0.dll
%{mingw64_bindir}/libgettextsrc-0-19-7.dll
%{mingw64_bindir}/libgettextsrc-0-21.dll
%{mingw64_bindir}/libintl-8.dll
%{mingw64_bindir}/libtextstyle-0.dll
%{mingw64_bindir}/msg*.exe
%{mingw64_bindir}/ngettext.exe
%{mingw64_bindir}/recode-sr-latin.exe
@ -171,11 +179,16 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw64_includedir}/autosprintf.h
%{mingw64_includedir}/gettext-po.h
%{mingw64_includedir}/libintl.h
%{mingw64_includedir}/textstyle.h
%{mingw64_includedir}/textstyle/stdbool.h
%{mingw64_includedir}/textstyle/version.h
%{mingw64_includedir}/textstyle/woe32dll.h
%{mingw64_libdir}/libasprintf.dll.a
%{mingw64_libdir}/libgettextlib.dll.a
%{mingw64_libdir}/libgettextpo.dll.a
%{mingw64_libdir}/libgettextsrc.dll.a
%{mingw64_libdir}/libintl.dll.a
%{mingw64_libdir}/libtextstyle.dll.a
%{mingw64_datadir}/gettext/
%{mingw64_datadir}/gettext-%{version}/
%{mingw64_datadir}/aclocal/*m4
@ -184,12 +197,53 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
%{mingw64_libdir}/libasprintf.a
%{mingw64_libdir}/libgettextpo.a
%{mingw64_libdir}/libintl.a
%{mingw64_libdir}/libtextstyle.a
%changelog
* Tue Aug 14 2018 Victor Toso <victortoso@redhat.com> - 0.19.7-5
- ExclusiveArch: i686, x86_64
- Related: rhbz#1615874
* Mon Aug 7 2023 Konstantin Kostiuk <kkostiuk@redhat.com> - 0.21-5
- Update license to SPDX format
- Resolves: RHEL-1054
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.21-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.21-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 03 2020 Sandro Mani <manisandro@gmail.com> - 0.21.0-1
- Update to 0.21.0
* Tue Jul 28 2020 Sandro Mani <manisandro@gmail.com> - 0.20.2-3
- Add gettext-printf_collision.patch
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Apr 16 2020 Sandro Mani <manisandro@gmail.com> - 0.20.2-1
- Update to 0.20.2
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Oct 08 2019 Sandro Mani <manisandro@gmail.com> - 0.20.1-2
- Rebuild (Changes/Mingw32GccDwarf2)
* Tue Aug 13 2019 Fabiano Fidêncio <fidencio@redhat.com> - 0.20.1-1
- Update the sources accordingly to its native counter part, rhbz#1740721
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1 +0,0 @@
SHA512 (gettext-0.19.7.tar.gz) = 7ba89074d3eddd0b4a5e2980e1ec74b53c49b7a04a1fa91c70c4bc11ce9c30415e4df9d79698148eaaed325fb4feb25a340a2e8e01fbe86b1a66b1376a4c9e3d