From f28b1b6343072923ce647921f6c949ea626a3be5 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 8 Jan 2021 10:13:06 -0300
Subject: [PATCH] Fixing locale conflict, updating translation.

---
 autogen.sh          | 18 ++++++++++++++++--
 configure.ac        |  2 +-
 locale/pt_BR.po     | 41 +++++++++++++++++++++++------------------
 rpm/libipc3270.spec |  5 ++---
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index dc2863e..8eea9b1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,19 +6,33 @@ test -n "$srcdir" || srcdir=.
 olddir=`pwd`
 cd "$srcdir"
 
+mkdir -p scripts
+mkdir -p m4
+
+libtoolize --force
+if test $? != 0 ; then
+	echo "libtoolize failed."
+	exit -1
+fi
+
 aclocal
 if test $? != 0 ; then
 	echo "aclocal failed."
 	exit -1
 fi
 
-autoconf
+#autoheader --force
+#if test $? != 0 ; then
+#	echo "autoheader failed."
+#	exit -1
+#fi
+
+autoconf --force
 if test $? != 0 ; then
 	echo "autoconf failed."
 	exit -1
 fi
 
-mkdir -p scripts
 automake --add-missing 2> /dev/null | true
 
 cd "$olddir"
diff --git a/configure.ac b/configure.ac
index 3afff54..6ab4a7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,7 +434,7 @@ dnl ---------------------------------------------------------------------------
 dnl Set translation domain.
 dnl ---------------------------------------------------------------------------
 
-app_cv_gettext_package="libipc3270"
+app_cv_gettext_package="libipc3270-$app_vrs_major.$app_vrs_minor"
 
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$app_cv_gettext_package")
 AC_SUBST(GETTEXT_PACKAGE,"$app_cv_gettext_package")
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 73a194d..a908993 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -1,12 +1,12 @@
 #
-# Perry Werneck <perry.werneck@gmail.com>, 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020.
+# Perry Werneck <perry.werneck@gmail.com>, 2012, 2013, 2014, 2016, 2017, 2018, 2019, 2020, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-10 15:55-0300\n"
-"PO-Revision-Date: 2020-01-10 15:59-0300\n"
+"POT-Creation-Date: 2021-01-08 10:10-0300\n"
+"PO-Revision-Date: 2021-01-08 10:11-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
 "Language: pt_BR\n"
@@ -16,9 +16,17 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
+#: src/session/local/init.cc:90
+msgid " is invalid."
+msgstr "é inválido"
+
+#: src/session/local/init.cc:86
+msgid " is not in the required revision "
+msgstr "não está na versão necessária"
+
 #: src/session/local/get.cc:52 src/session/local/get.cc:65
 #: src/session/local/get.cc:78
 msgid "Can't get screen contents"
@@ -28,24 +36,23 @@ msgstr "Não foi possível obter o conteúdo da tela"
 msgid "Can't start IPC Module"
 msgstr "Não foi possível iniciar o módulo IPC"
 
-#: src/session/local/init.cc:79
-msgid "Invalid callback table, possible version mismatch in lib3270"
-msgstr ""
-"Tabela de callbacks inválida, possível divergência de versão na lib3270"
+#: src/session/local/init.cc:81
+msgid "Invalid callback table; "
+msgstr "Tabela de chamadas inválida"
 
-#: src/session/local/events.cc:87 src/session/local/events.cc:147
+#: src/session/local/events.cc:88 src/session/local/events.cc:142
 msgid "Invalid session handler"
 msgstr "Identificador de sessão é inválido"
 
-#: src/session/local/events.cc:70
+#: src/session/local/events.cc:71
 msgid "Out of memory in vasprintf"
 msgstr "Memória insuficiente em vasprintf"
 
-#: src/session/local/events.cc:169
+#: src/session/local/events.cc:164
 msgid "connected"
 msgstr "Conectado"
 
-#: src/session/local/events.cc:169
+#: src/session/local/events.cc:164
 msgid "disconnected"
 msgstr "Desconectado"
 
@@ -1340,12 +1347,13 @@ msgstr "Desconectado"
 #~ msgid "Invalid argument format"
 #~ msgstr "O formato do argumento é inválido"
 
+#~ msgid "Invalid callback table, possible version mismatch in lib3270"
+#~ msgstr ""
+#~ "Tabela de callbacks inválida, possível divergência de versão na lib3270"
+
 #~ msgid "Invalid cgcsgid value"
 #~ msgstr "Valor cgcsgid é inválido"
 
-#~ msgid "Invalid character value"
-#~ msgstr "Valor de caractere inválido"
-
 #~ msgid "Invalid charset entry '%s' (#%d)"
 #~ msgstr "Invalid charset entry '%s' (#%d)"
 
@@ -1572,9 +1580,6 @@ msgstr "Desconectado"
 #~ msgid "OIA separator"
 #~ msgstr "Separador da OIA"
 
-#~ msgid "OIA status invalid"
-#~ msgstr "Estado inválido na OIA"
-
 #~ msgid "OIA status ok"
 #~ msgstr "Estado normal na OIA"
 
diff --git a/rpm/libipc3270.spec b/rpm/libipc3270.spec
index 4331d89..1dcdb2d 100644
--- a/rpm/libipc3270.spec
+++ b/rpm/libipc3270.spec
@@ -20,14 +20,14 @@
 
 Summary:		IPC client library for lib3270/%{product} 
 Name:			libipc3270
-Version:		5.2
+Version:		5.3
 Release:		0
 License:		LGPL-3.0
 Source:			%{name}-%{version}.tar.xz
 
 URL:			https://github.com/PerryWerneck/libipc3270
 
-Group:			System/Libraries
+Group:			Development/Libraries/C and C++
 BuildRoot:		/var/tmp/%{name}-%{version}
 
 BuildRequires:	autoconf >= 2.61
@@ -71,7 +71,6 @@ For more details, see https://github.com/PerryWerneck/libipc3270 .
 
 %package -n %{name}-%{_libvrs}
 Summary:	IPC Library for %{product}
-Group:		Development/Libraries/C and C++
 
 %if 0%{?suse_version}
 Recommends: lib3270-ipc-service
--
libgit2 0.21.2