- updated to 0.20.1

- updated kill_tools patch

diff --git a/crossmingw32-gettext-kill_tools.patch b/crossmingw32-gettext-kill_tools.patch
index e37edb19719292ed94547fe5b8d73e816bc8a627..7535a987a1198fed836256ea427f69b2298df30b 100644 (file)
--- a/crossmingw32-gettext-kill_tools.patch
+++ b/crossmingw32-gettext-kill_tools.patch
@@ -1,22 +1,22 @@
---- gettext-0.18.1.1/configure.ac.orig 2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/configure.ac      2010-06-20 00:03:32.991443936 +0200
+--- gettext-0.20.1/configure.ac.orig   2019-06-27 21:32:43.612311259 +0200
++++ gettext-0.20.1/configure.ac        2019-06-27 21:34:51.651617610 +0200
 @@ -37,7 +37,7 @@
  
  dnl Checks for library functions.
  
--AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
+-AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
 +AC_CONFIG_SUBDIRS([gettext-runtime])
  
- dnl Ensure that "configure --help" lists all the command line options that
- dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should
---- gettext-0.18.1.1/Makefile.am.orig  2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/Makefile.am       2010-06-20 00:03:49.599439746 +0200
-@@ -20,7 +20,7 @@
- ACLOCAL = build-aux/fixaclocal @ACLOCAL@
+ AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
+ 
+--- gettext-0.20.1/Makefile.am.orig    2019-06-27 21:32:43.615644574 +0200
++++ gettext-0.20.1/Makefile.am 2019-06-27 21:35:23.144780330 +0200
+@@ -19,7 +19,7 @@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4
  
--SUBDIRS = gnulib-local gettext-runtime gettext-tools
+-SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
 +SUBDIRS = gnulib-local gettext-runtime
  
- EXTRA_DIST = \
-   version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
+ changelog_etc = \
+   gettext-runtime/ChangeLog.0 \

diff --git a/crossmingw32-gettext.spec b/crossmingw32-gettext.spec
index c0037e431f7eb0e466f0f1ad8dccb923bf33299b..3b6c0365e80ce2ebacc380f299433a452f307f91 100644 (file)
--- a/crossmingw32-gettext.spec
+++ b/crossmingw32-gettext.spec
@@ -2,26 +2,25 @@
 Summary:       gettext libraries - cross MinGW32 version
 Summary(pl.UTF-8):     Biblioteki gettext - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       0.19.8.1
-Release:       5
+Version:       0.20.1
+Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
-Source0:       http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.lz
-# Source0-md5: d838d2c4144261d0c5fbab4a0aceb5c1
-Patch0:                %{realname}-libintl_by_gcj.patch
-Patch1:                %{name}-kill_tools.patch
-Patch2:                %{realname}-mingw32.patch
+Source0:       http://ftp.gnu.org/gnu/gettext/%{realname}-%{version}.tar.xz
+# Source0-md5: 9ed9e26ab613b668e0026222a9c23639
+Patch0:                %{name}-kill_tools.patch
+Patch1:                %{realname}-mingw32.patch
 URL:           http://www.gnu.org/software/gettext/
-BuildRequires: autoconf >= 2.62
+BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.13
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-gcc-c++
 BuildRequires: crossmingw32-libiconv
 BuildRequires: libtool >= 2:2
-BuildRequires: lzip
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
+BuildRequires: xz
 Requires:      crossmingw32-libiconv
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -81,7 +80,6 @@ Biblioteki DLL gettext dla Windows.
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i \
        -e 's@m4_esyscmd(\[build-aux/git-version-gen \.tarball-version\])@[%{version}]@' \
@@ -92,7 +90,6 @@ Biblioteki DLL gettext dla Windows.
        gettext-tools/configure.ac
 
 %build
-%{__libtoolize}
 cd gettext-runtime
 %{__libtoolize}
 %{__aclocal} -I m4 -I ../m4 -I gnulib-m4
@@ -104,12 +101,22 @@ cd libasprintf
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd ../../gettext-tools
+cd ../../libtextstyle
+%{__libtoolize}
+%{__aclocal} -I m4 -I gnulib-m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../gettext-tools
 %{__aclocal} -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd ..
+cd examples
+%{__aclocal} -I ../../gettext-runtime/m4 -I ../../m4
+%{__autoconf}
+%{__automake}
+cd ../..
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}

diff --git a/gettext-killkillkill.patch b/gettext-killkillkill.patch
deleted file mode 100644 (file)
index 7352eb7..0000000
--- a/gettext-killkillkill.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru gettext-0.12/gettext-tools/misc/gettextize.in gettext-0.12.orig/gettext-tools/misc/gettextize.in
---- gettext-0.12.orig/gettext-tools/misc/gettextize.in 2003-05-08 22:41:15.000000000 +0200
-+++ gettext-0.12/gettext-tools/misc/gettextize.in      2003-05-20 14:30:03.000000000 +0200
-@@ -1052,10 +1052,6 @@
-     5) count="five paragraphs";;
-     *) count="$count paragraphs";;
-   esac
--  echo "Press Return to acknowledge the previous $count."
--  # Read from /dev/tty, not stdin, so that gettextize cannot be abused by
--  # non-interactive tools.
--  read dummy < /dev/tty
- fi
- 
- exit 0

diff --git a/gettext-libintl_by_gcj.patch b/gettext-libintl_by_gcj.patch
deleted file mode 100644 (file)
index a3ed02b..0000000
--- a/gettext-libintl_by_gcj.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext-0.18/gettext-runtime/configure.ac.orig     2010-03-29 00:06:07.000000000 +0200
-+++ gettext-0.18/gettext-runtime/configure.ac  2010-05-16 09:05:06.198932556 +0200
-@@ -35,7 +35,7 @@
- 
- gt_JAVA_CHOICE
- 
--gt_JAVACOMP([1.3], [1.1])
-+gt_JAVACOMP([1.3], [1.4])
- AC_CHECK_PROG([JAR], [jar], [jar])
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
-   BUILDJAVA=yes