Download as
Browse Code »

Commit b90c32f423208bbbd8ae408817440e455af05f1d

Authored by Perry Werneck
1 parent fdf174f8
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updating win32 package.

Showing 2 changed files with 30 additions and 62 deletions   Show diff stats
locale/pw3270.pot
  Diff comments   View file @b90c32f
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-02-20 14:06-0300\n"
  12 +"POT-Creation-Date: 2019-02-21 10:31-0300\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 32 "Project-Id-Version: PACKAGE VERSION\n"
33 33 "Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2019-02-19 21:58+0000\n"
  34 +"POT-Creation-Date: 2019-02-20 20:12+0000\n"
35 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 37 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
win/mingw32-pw3270.spec
  Diff comments   View file @b90c32f
... ... @@ -17,7 +17,7 @@
17 17 #
18 18  
19 19 %define MAJOR_VERSION 5
20   -%define MINOR_VERSION 1
  20 +%define MINOR_VERSION 2
21 21  
22 22 %define __strip %{_mingw32_strip}
23 23 %define __objdump %{_mingw32_objdump}
... ... @@ -30,25 +30,26 @@
30 30 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
31 31  
32 32 Name: mingw32-pw3270
33   -Version: 5.1
  33 +Version: 5.2
34 34 Release: 0
35 35 Summary: IBM 3270 Terminal emulator for GTK
36 36 License: GPL-2.0
37 37 Group: System/X11/Terminals
38 38 Url: http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270
39   -Source: pw3270-%{version}.tar.bz2
  39 +Source: pw3270-%{version}.tar.xz
40 40 BuildRoot: %{_tmppath}/%{name}-%{version}-build
41 41  
42   -Requires: mingw32-gtk3
43   -Requires: mingw32-lib3270 = %{version}
  42 +Provides: mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
  43 +Conflicts: otherproviders(mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION})
44 44  
45   -Provides: mingw32(lib:pw3270) = %{version}
46   -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}
  45 +Provides: mingw32(lib:pw3270)
47 46  
48 47 BuildRequires: autoconf
49 48 BuildRequires: automake
50   -BuildRequires: rsvg-view
  49 +
51 50 BuildRequires: gettext-tools
  51 +
  52 +BuildRequires: rsvg-view
52 53 BuildRequires: glib2-devel
53 54 BuildRequires: pkgconfig(gtk+-3.0)
54 55  
... ... @@ -59,14 +60,17 @@ BuildRequires: mingw32-cross-binutils
59 60 BuildRequires: mingw32-cross-gcc
60 61 BuildRequires: mingw32-cross-gcc-c++
61 62 BuildRequires: mingw32-cross-pkg-config
  63 +
62 64 BuildRequires: mingw32-filesystem
63 65 BuildRequires: mingw32-libopenssl-devel
64 66 BuildRequires: mingw32-zlib-devel
65 67 BuildRequires: sed
66 68  
67 69 BuildRequires: mingw32(pkg:gtk+-win32-3.0)
  70 +BuildRequires: mingw32(pkg:lib3270)
  71 +BuildRequires: mingw32(pkg:libv3270)
68 72  
69   -#Patch0: force_inet_ntop.patch
  73 +BuildRequires: ImageMagick
70 74  
71 75 #---------------------------------------------------------------------------------------------------------------------
72 76  
... ... @@ -74,42 +78,15 @@ BuildRequires: mingw32(pkg:gtk+-win32-3.0)
74 78 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.
75 79 Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide.
76 80  
77   -#--[ lib3270 ]--------------------------------------------------------------------------------------------------------
78   -
79   -%package -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
80   -Summary: 3270 Communication library for %{name}
81   -Group: Development/Libraries/C and C++
82   -
83   -Provides: mingw32-lib3270 = %{version}
84   -Provides: mingw32(lib:3270) = %{version}
85   -
86   -%description -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
87   -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.
88   -
89   -This package contains the tn3270 protocol library for %{name}
90   -
91 81 #--[ Devel ]----------------------------------------------------------------------------------------------------------
92 82  
93   -%package -n mingw32-lib3270-devel
94   -Summary: Devel for 3270 Communication library for %{name}
95   -Group: Development/Libraries/C and C++
96   -
97   -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}
98   -Provides: mingw32-lib3270-devel-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}
99   -Requires: mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}
100   -
101   -%description -n mingw32-lib3270-devel
102   -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.
103   -This package contains the development files for tn3270 protocol library for %{name}
104   -
105   -%package -n %{name}-devel
  83 +%package devel
106 84 Summary: Files required for development of %{name} plugins
107 85 Group: Development/Libraries/C and C++
108 86  
109   -Requires: mingw32(lib:3270) = %{version}
110   -Requires: mingw32(lib:pw3270) = %{version}
  87 +Requires: mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}
111 88  
112   -%description -n %{name}-devel
  89 +%description devel
113 90 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.
114 91  
115 92 This package contains the development files for %{name}
... ... @@ -128,7 +105,12 @@ echo &quot;m4_define([APP_LEVEL], 0)&quot; &gt;&gt; revision.m4
128 105 find . -exec touch {} \;
129 106 aclocal
130 107 autoconf
131   -%{_mingw32_configure}
  108 +%{_mingw32_configure} \
  109 + --with-source-locales=%{_mingw32_datadir}/pw3270/pot
  110 +
  111 +echo ---------------------------------------------------------
  112 +cat Makefile
  113 +echo ---------------------------------------------------------
132 114  
133 115 %build
134 116 make clean
... ... @@ -136,18 +118,16 @@ make all
136 118  
137 119 %{_mingw32_strip} --strip-all .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
138 120 %{_mingw32_strip} --strip-all .bin/Release/*.exe
139   -%{_mingw32_strip} --strip-all .bin/Release/plugins/*.dll
140 121  
141 122 %install
142 123 %{_mingw32_makeinstall}
143 124  
144   -sed -i -e "s@^Version:.*@Version: %{version}@g" %{buildroot}%{_mingw32_libdir}/pkgconfig/lib3270.pc
145 125 sed -i -e "s@^Version:.*@Version: %{version}@g" %{buildroot}%{_mingw32_libdir}/pkgconfig/pw3270.pc
146 126  
  127 +# Deprecated, remove them
147 128 rm -f %{buildroot}%{_mingw32_datadir}/pw3270/ui/80javasamples.xml
148 129 rm -f %{buildroot}%{_mingw32_datadir}/pw3270/ui/80rexx.xml
149 130  
150   -
151 131 %clean
152 132 rm -rf %{buildroot}
153 133  
... ... @@ -156,11 +136,12 @@ rm -rf %{buildroot}
156 136 %files
157 137 %defattr(-,root,root)
158 138 %doc AUTHORS LICENSE
159   -# %{_mingw32_mandir}/*/*
160 139  
161 140 # Main application
162 141 %dir %{_mingw32_datadir}/pw3270
163 142 %dir %{_mingw32_datadir}/pw3270/ui
  143 +%dir %{_mingw32_datadir}/pw3270/charsets
  144 +
164 145 %{_mingw32_bindir}/pw3270.exe
165 146 %{_mingw32_libdir}/pw3270.dll
166 147 %{_mingw32_libdir}/pw3270.dll.%{MAJOR_VERSION}
... ... @@ -172,6 +153,7 @@ rm -rf %{buildroot}
172 153 %{_mingw32_datadir}/pw3270/colors.conf
173 154 %{_mingw32_datadir}/pw3270/pw3270.png
174 155 %{_mingw32_datadir}/pw3270/pw3270-logo.png
  156 +%{_mingw32_datadir}/pw3270/charsets/bracket.xml
175 157  
176 158 %dir %{_mingw32_datadir}/locale
177 159 %dir %{_mingw32_datadir}/locale/pt_BR
... ... @@ -179,22 +161,8 @@ rm -rf %{buildroot}
179 161 %{_mingw32_datadir}/locale/pt_BR/LC_MESSAGES/pw3270.mo
180 162  
181 163 %dir %{_mingw32_libdir}/pw3270-plugins
182   -%{_mingw32_libdir}/libhllapi.dll
183   -%{_mingw32_libdir}/pw3270-plugins/hllapi.dll
184   -
185   -%files -n mingw32-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
186   -%defattr(-,root,root)
187   -%{_mingw32_libdir}/lib3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
188   -%{_mingw32_libdir}/lib3270.dll.%{MAJOR_VERSION}
189   -%{_mingw32_libdir}/lib3270.dll
190   -
191   -%files -n mingw32-lib3270-devel
192   -%defattr(-,root,root)
193   -%{_mingw32_includedir}/lib3270
194   -%{_mingw32_includedir}/lib3270.h
195   -%{_mingw32_libdir}/pkgconfig/lib3270.pc
196 164  
197   -%files -n %{name}-devel
  165 +%files devel
198 166 %defattr(-,root,root)
199 167 %{_mingw32_includedir}/pw3270
200 168 %{_mingw32_includedir}/pw3270.h
... ... @@ -207,7 +175,7 @@ rm -rf %{buildroot}
207 175 %{_mingw32_datadir}/pw3270/locale/pt_BR.po
208 176 %{_mingw32_datadir}/pw3270/locale/pw3270.pot
209 177  
210   -%{_mingw32_includedir}/pw3270cpp.h
  178 +#%{_mingw32_includedir}/pw3270cpp.h
211 179 %{_mingw32_libdir}/libpw3270cpp.a
212 180  
213 181 %changelog
... ...