diff --git a/locale/pw3270.pot b/locale/pw3270.pot index d7b2ae1..601d9a4 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-20 14:06-0300\n" +"POT-Creation-Date: 2019-02-21 10:31-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-19 21:58+0000\n" +"POT-Creation-Date: 2019-02-20 20:12+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/win/mingw32-pw3270.spec b/win/mingw32-pw3270.spec index 16f9e16..b49868e 100644 --- a/win/mingw32-pw3270.spec +++ b/win/mingw32-pw3270.spec @@ -17,7 +17,7 @@ # %define MAJOR_VERSION 5 -%define MINOR_VERSION 1 +%define MINOR_VERSION 2 %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} @@ -30,25 +30,26 @@ #---[ Packaging ]----------------------------------------------------------------------------------------------------- Name: mingw32-pw3270 -Version: 5.1 +Version: 5.2 Release: 0 Summary: IBM 3270 Terminal emulator for GTK License: GPL-2.0 Group: System/X11/Terminals Url: http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 -Source: pw3270-%{version}.tar.bz2 +Source: pw3270-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: mingw32-gtk3 -Requires: mingw32-lib3270 = %{version} +Provides: mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION} +Conflicts: otherproviders(mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION}) -Provides: mingw32(lib:pw3270) = %{version} -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} +Provides: mingw32(lib:pw3270) BuildRequires: autoconf BuildRequires: automake -BuildRequires: rsvg-view + BuildRequires: gettext-tools + +BuildRequires: rsvg-view BuildRequires: glib2-devel BuildRequires: pkgconfig(gtk+-3.0) @@ -59,14 +60,17 @@ BuildRequires: mingw32-cross-binutils BuildRequires: mingw32-cross-gcc BuildRequires: mingw32-cross-gcc-c++ BuildRequires: mingw32-cross-pkg-config + BuildRequires: mingw32-filesystem BuildRequires: mingw32-libopenssl-devel BuildRequires: mingw32-zlib-devel BuildRequires: sed BuildRequires: mingw32(pkg:gtk+-win32-3.0) +BuildRequires: mingw32(pkg:lib3270) +BuildRequires: mingw32(pkg:libv3270) -#Patch0: force_inet_ntop.patch +BuildRequires: ImageMagick #--------------------------------------------------------------------------------------------------------------------- @@ -74,42 +78,15 @@ BuildRequires: mingw32(pkg:gtk+-win32-3.0) Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide. -#--[ lib3270 ]-------------------------------------------------------------------------------------------------------- - -%package -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} -Summary: 3270 Communication library for %{name} -Group: Development/Libraries/C and C++ - -Provides: mingw32-lib3270 = %{version} -Provides: mingw32(lib:3270) = %{version} - -%description -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} -Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. - -This package contains the tn3270 protocol library for %{name} - #--[ Devel ]---------------------------------------------------------------------------------------------------------- -%package -n mingw32-lib3270-devel -Summary: Devel for 3270 Communication library for %{name} -Group: Development/Libraries/C and C++ - -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} -Provides: mingw32-lib3270-devel-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} - -%description -n mingw32-lib3270-devel -Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. -This package contains the development files for tn3270 protocol library for %{name} - -%package -n %{name}-devel +%package devel Summary: Files required for development of %{name} plugins Group: Development/Libraries/C and C++ -Requires: mingw32(lib:3270) = %{version} -Requires: mingw32(lib:pw3270) = %{version} +Requires: mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} -%description -n %{name}-devel +%description devel Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. This package contains the development files for %{name} @@ -128,7 +105,12 @@ echo "m4_define([APP_LEVEL], 0)" >> revision.m4 find . -exec touch {} \; aclocal autoconf -%{_mingw32_configure} +%{_mingw32_configure} \ + --with-source-locales=%{_mingw32_datadir}/pw3270/pot + +echo --------------------------------------------------------- +cat Makefile +echo --------------------------------------------------------- %build make clean @@ -136,18 +118,16 @@ make all %{_mingw32_strip} --strip-all .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} %{_mingw32_strip} --strip-all .bin/Release/*.exe -%{_mingw32_strip} --strip-all .bin/Release/plugins/*.dll %install %{_mingw32_makeinstall} -sed -i -e "s@^Version:.*@Version: %{version}@g" %{buildroot}%{_mingw32_libdir}/pkgconfig/lib3270.pc sed -i -e "s@^Version:.*@Version: %{version}@g" %{buildroot}%{_mingw32_libdir}/pkgconfig/pw3270.pc +# Deprecated, remove them rm -f %{buildroot}%{_mingw32_datadir}/pw3270/ui/80javasamples.xml rm -f %{buildroot}%{_mingw32_datadir}/pw3270/ui/80rexx.xml - %clean rm -rf %{buildroot} @@ -156,11 +136,12 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS LICENSE -# %{_mingw32_mandir}/*/* # Main application %dir %{_mingw32_datadir}/pw3270 %dir %{_mingw32_datadir}/pw3270/ui +%dir %{_mingw32_datadir}/pw3270/charsets + %{_mingw32_bindir}/pw3270.exe %{_mingw32_libdir}/pw3270.dll %{_mingw32_libdir}/pw3270.dll.%{MAJOR_VERSION} @@ -172,6 +153,7 @@ rm -rf %{buildroot} %{_mingw32_datadir}/pw3270/colors.conf %{_mingw32_datadir}/pw3270/pw3270.png %{_mingw32_datadir}/pw3270/pw3270-logo.png +%{_mingw32_datadir}/pw3270/charsets/bracket.xml %dir %{_mingw32_datadir}/locale %dir %{_mingw32_datadir}/locale/pt_BR @@ -179,22 +161,8 @@ rm -rf %{buildroot} %{_mingw32_datadir}/locale/pt_BR/LC_MESSAGES/pw3270.mo %dir %{_mingw32_libdir}/pw3270-plugins -%{_mingw32_libdir}/libhllapi.dll -%{_mingw32_libdir}/pw3270-plugins/hllapi.dll - -%files -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} -%defattr(-,root,root) -%{_mingw32_libdir}/lib3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} -%{_mingw32_libdir}/lib3270.dll.%{MAJOR_VERSION} -%{_mingw32_libdir}/lib3270.dll - -%files -n mingw32-lib3270-devel -%defattr(-,root,root) -%{_mingw32_includedir}/lib3270 -%{_mingw32_includedir}/lib3270.h -%{_mingw32_libdir}/pkgconfig/lib3270.pc -%files -n %{name}-devel +%files devel %defattr(-,root,root) %{_mingw32_includedir}/pw3270 %{_mingw32_includedir}/pw3270.h @@ -207,7 +175,7 @@ rm -rf %{buildroot} %{_mingw32_datadir}/pw3270/locale/pt_BR.po %{_mingw32_datadir}/pw3270/locale/pw3270.pot -%{_mingw32_includedir}/pw3270cpp.h +#%{_mingw32_includedir}/pw3270cpp.h %{_mingw32_libdir}/libpw3270cpp.a %changelog -- libgit2 0.21.2