cygwin-gettext 0.19.7

4 files changed, 39 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e4c90f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/gettext-0.19.7.tar.xz
diff --git a/cygwin-gettext.spec b/cygwin-gettext.spec
index 835831c..9c92546 100644
--- a/cygwin-gettext.spec
+++ b/cygwin-gettext.spec
@@ -1,7 +1,7 @@
 %{?cygwin_package_header}
 
 Name:      cygwin-gettext
-Version:   0.19.5.1
+Version:   0.19.7
 Release:   1%{?dist}
 Summary:   GNU libraries and utilities for producing multi-lingual messages
 
@@ -14,6 +14,7 @@ Source0:   http://ftp.gnu.org/pub/gnu/gettext/gettext-%{version}.tar.xz
 Patch0:    gettext-0.18.1.1-autopoint-V.patch
 Patch1:    gettext-0.19.3-localename.patch
 Patch4:    gettext-0.18.1.1-no-woe32dll.patch
+Patch5:    gettext-0.19.7-gnulib-cygwin25.patch
 
 BuildRequires: autoconf automake cygwin-libtool-base
 BuildRequires: cygwin32-filesystem >= 10
@@ -77,6 +78,7 @@ Static version of the Gettext library for the Cygwin x86_64 toolchain.
 %patch0 -p2
 %patch1 -p2
 %patch4 -p2
+%patch5 -p2
 
 rm -f m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
 touch m4/libtool.m4 gettext-tools/gnulib-m4/openmp.m4
@@ -169,6 +171,7 @@ rm -f $RPM_BUILD_ROOT%{cygwin32_bindir}/cyggettextsrc-*.dll
 rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/libgettextlib.*
 rm -f $RPM_BUILD_ROOT%{cygwin32_libdir}/libgettextsrc.*
 rm -fr $RPM_BUILD_ROOT%{cygwin32_libdir}/gettext/
+rm -fr $RPM_BUILD_ROOT%{cygwin32_datadir}/gettext-*/
 
 rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/*.exe
 rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/gettext.sh
@@ -177,6 +180,7 @@ rm -f $RPM_BUILD_ROOT%{cygwin64_bindir}/cyggettextsrc-*.dll
 rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/libgettextlib.*
 rm -f $RPM_BUILD_ROOT%{cygwin64_libdir}/libgettextsrc.*
 rm -fr $RPM_BUILD_ROOT%{cygwin64_libdir}/gettext/
+rm -fr $RPM_BUILD_ROOT%{cygwin64_datadir}/gettext-*/
 
 # We intentionally don't ship *.la files
 find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -228,6 +232,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Mon Sep 12 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.19.7-1
+- new version
+
 * Sun Feb 21 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.19.5.1-1
 - new version
 
diff --git a/gettext-0.18.1.1-autopoint-V.patch b/gettext-0.18.1.1-autopoint-V.patch
index d49207b..4971343 100644
--- a/gettext-0.18.1.1-autopoint-V.patch
+++ b/gettext-0.18.1.1-autopoint-V.patch
@@ -43,12 +43,12 @@
          func_version
          exit 0 ;;
 @@ -276,7 +276,7 @@ fi
- if test -n "$xver"; then
-   if test -n "$ver"; then
-     if test "X$ver" != "X$xver"; then
--      func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
-+      echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
-     fi
-   else
-     ver="$xver"
+   if test -n "$xver"; then
+     if test -n "$ver"; then
+       if test "X$ver" != "X$xver"; then
+-        func_fatal_error "Version mismatch: specified -V $ver but the package uses gettext version $xver"
++        echo "autopoint: warning: Version mismatch: specified -V $ver but the package uses gettext version $xver. Forcibly upgrading to $ver" 1>&2
+       fi
+     else
+       ver="$xver"
 
diff --git a/gettext-0.19.7-gnulib-cygwin25.patch b/gettext-0.19.7-gnulib-cygwin25.patch
new file mode 100644
index 0000000..e2e6954
--- /dev/null
+++ b/gettext-0.19.7-gnulib-cygwin25.patch
@@ -0,0 +1,22 @@
+https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00057.html
+
+--- origsrc/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h	2015-12-27 17:08:31.000000000 -0600
++++ src/gettext-0.19.7/gettext-tools/gnulib-lib/sys_select.in.h	2016-05-04 10:07:56.425638400 -0500
+@@ -82,7 +82,7 @@
+    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
+    in <sys/time.h>.
+    But avoid namespace pollution on glibc systems.  */
+-# ifndef __GLIBC__
++# if !(defined __GLIBC__ || defined __NEWLIB__)
+ #  include <sys/time.h>
+ # endif
+ 
+@@ -103,7 +103,7 @@
+    But avoid namespace pollution on glibc systems.
+    Do this after the include_next (for the sake of OpenBSD 5.0) but before
+    the split double-inclusion guard (for the sake of Solaris).  */
+-#if !(defined __GLIBC__ && !defined __UCLIBC__)
++#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__)
+ # include <signal.h>
+ #endif
+