Download as
Browse Code »

Commit d716856843dd1db7fe312af9c63ff6641a3358a3

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

Ajustes para empacotamento windows.

Showing 3 changed files with 17 additions and 19 deletions   Show diff stats
locale/pw3270.pot
  Diff comments   View file @d716856
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-01-24 10:50-0200\n" 12 +"POT-Creation-Date: 2017-01-24 14:01-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-01-24 10:50-0200\n" 23 +"POT-Creation-Date: 2017-01-24 14:01-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
src/plugins/hllapi/Makefile.in
  Diff comments   View file @d716856
@@ -242,7 +242,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -242,7 +242,7 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
242 242
243 @echo $@ ... 243 @echo $@ ...
244 @$(MKDIR) `dirname $@` 244 @$(MKDIR) `dirname $@`
245 - $(LD) \ 245 + @$(LD) \
246 -shared \ 246 -shared \
247 -Wl,-soname,`basename $@` \ 247 -Wl,-soname,`basename $@` \
248 -L$(BASEDIR)/.bin/Debug \ 248 -L$(BASEDIR)/.bin/Debug \
win/mingw64-pw3270.spec
  Diff comments   View file @d716856
@@ -39,8 +39,6 @@ Url: http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 @@ -39,8 +39,6 @@ Url: http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270
39 Source: pw3270-%{version}.tar.bz2 39 Source: pw3270-%{version}.tar.bz2
40 BuildRoot: %{_tmppath}/%{name}-%{version}-build 40 BuildRoot: %{_tmppath}/%{name}-%{version}-build
41 41
42 -BuildArch: noarch  
43 -  
44 Requires: mingw64-gtk3 42 Requires: mingw64-gtk3
45 Requires: mingw64-lib3270 = %{version} 43 Requires: mingw64-lib3270 = %{version}
46 44
@@ -52,7 +50,10 @@ BuildRequires: automake @@ -52,7 +50,10 @@ BuildRequires: automake
52 BuildRequires: rsvg-view 50 BuildRequires: rsvg-view
53 BuildRequires: gettext-tools 51 BuildRequires: gettext-tools
54 BuildRequires: glib2-devel 52 BuildRequires: glib2-devel
55 -BuildRequires: gtk3-devel 53 +
  54 +#BuildRequires: gtk3-devel
  55 +BuildRequires: pkgconfig(gtk+-3.0)
  56 +
56 BuildRequires: desktop-file-utils 57 BuildRequires: desktop-file-utils
57 BuildRequires: optipng 58 BuildRequires: optipng
58 59
@@ -63,7 +64,9 @@ BuildRequires: mingw64-cross-pkg-config @@ -63,7 +64,9 @@ BuildRequires: mingw64-cross-pkg-config
63 BuildRequires: mingw64-filesystem 64 BuildRequires: mingw64-filesystem
64 BuildRequires: mingw64-libopenssl-devel 65 BuildRequires: mingw64-libopenssl-devel
65 BuildRequires: mingw64-zlib-devel 66 BuildRequires: mingw64-zlib-devel
66 -BuildRequires: mingw64-gtk3-devel 67 +#BuildRequires: mingw64-gtk3-devel
  68 +
  69 +BuildRequires: mingw64(pkg:gtk+-win32-3.0)
67 70
68 #--------------------------------------------------------------------------------------------------------------------- 71 #---------------------------------------------------------------------------------------------------------------------
69 72
@@ -76,10 +79,8 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra @@ -76,10 +79,8 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
76 %package -n mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} 79 %package -n mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
77 Summary: 3270 Communication library for %{name} 80 Summary: 3270 Communication library for %{name}
78 Group: Development/Libraries/C and C++ 81 Group: Development/Libraries/C and C++
79 -Requires: openssl  
80 82
81 Provides: mingw64-lib3270 = %{version} 83 Provides: mingw64-lib3270 = %{version}
82 -Provides: mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}  
83 Provides: mingw64(lib:3270) = %{version} 84 Provides: mingw64(lib:3270) = %{version}
84 85
85 %description -n mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} 86 %description -n mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
@@ -105,8 +106,8 @@ This package contains the development files for tn3270 protocol library for %{na @@ -105,8 +106,8 @@ This package contains the development files for tn3270 protocol library for %{na
105 Summary: Files required for development of %{name} plugins 106 Summary: Files required for development of %{name} plugins
106 Group: Development/Libraries/C and C++ 107 Group: Development/Libraries/C and C++
107 108
108 -Requires: mingw64-lib3270-devel-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version}  
109 -Requires: mingw64-libpw3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} 109 +Requires: mingw64(lib:3270) = %{version}
  110 +Requires: mingw64(lib:pw3270) = %{version}
110 111
111 %description -n %{name}-devel 112 %description -n %{name}-devel
112 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. 113 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.
@@ -132,14 +133,16 @@ autoconf @@ -132,14 +133,16 @@ autoconf
132 make clean 133 make clean
133 make all 134 make all
134 135
  136 +%{_mingw64_strip} --strip-all .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
  137 +%{_mingw64_strip} --strip-all .bin/Release/*.exe
  138 +%{_mingw64_strip} --strip-all .bin/Release/plugins/*.dll
  139 +
135 %install 140 %install
136 %{_mingw64_makeinstall} 141 %{_mingw64_makeinstall}
137 142
138 rm -f %{buildroot}%{_mingw64_datadir}/pw3270/ui/80javasamples.xml 143 rm -f %{buildroot}%{_mingw64_datadir}/pw3270/ui/80javasamples.xml
139 rm -f %{buildroot}%{_mingw64_datadir}/pw3270/ui/80rexx.xml 144 rm -f %{buildroot}%{_mingw64_datadir}/pw3270/ui/80rexx.xml
140 145
141 -#install --mode=755 .bin/Release/hllapi.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} %{buildroot}%{_mingw64_libdir}/libhllapi.dll  
142 -#install --mode=755 .bin/Release/plugins/hllapi.dll %{buildroot}%{_mingw64_libdir}/pw3270-plugins/hllapi.dll  
143 146
144 %clean 147 %clean
145 rm -rf %{buildroot} 148 rm -rf %{buildroot}
@@ -159,9 +162,6 @@ rm -rf %{buildroot} @@ -159,9 +162,6 @@ rm -rf %{buildroot}
159 %{_mingw64_libdir}/pw3270.dll.%{MAJOR_VERSION} 162 %{_mingw64_libdir}/pw3270.dll.%{MAJOR_VERSION}
160 %{_mingw64_libdir}/pw3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} 163 %{_mingw64_libdir}/pw3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
161 164
162 -#%dir %{_mingw64_datadir}/applications  
163 -#%{_mingw64_datadir}/applications/pw3270.desktop  
164 -  
165 %{_mingw64_datadir}/pw3270/ui/00default.xml 165 %{_mingw64_datadir}/pw3270/ui/00default.xml
166 %{_mingw64_datadir}/pw3270/ui/10functions.xml 166 %{_mingw64_datadir}/pw3270/ui/10functions.xml
167 %{_mingw64_datadir}/pw3270/ui/10keypad.xml 167 %{_mingw64_datadir}/pw3270/ui/10keypad.xml
@@ -198,6 +198,7 @@ rm -rf %{buildroot} @@ -198,6 +198,7 @@ rm -rf %{buildroot}
198 %{_mingw64_datadir}/pw3270/ui/98trace.xml 198 %{_mingw64_datadir}/pw3270/ui/98trace.xml
199 %{_mingw64_datadir}/pw3270/ui/99debug.xml 199 %{_mingw64_datadir}/pw3270/ui/99debug.xml
200 200
  201 +%dir %{_mingw64_datadir}/pw3270/locale
201 %{_mingw64_datadir}/pw3270/locale/Makefile 202 %{_mingw64_datadir}/pw3270/locale/Makefile
202 %{_mingw64_datadir}/pw3270/locale/pt_BR.po 203 %{_mingw64_datadir}/pw3270/locale/pt_BR.po
203 %{_mingw64_datadir}/pw3270/locale/pw3270.pot 204 %{_mingw64_datadir}/pw3270/locale/pw3270.pot
@@ -205,8 +206,5 @@ rm -rf %{buildroot} @@ -205,8 +206,5 @@ rm -rf %{buildroot}
205 %{_mingw64_includedir}/pw3270cpp.h 206 %{_mingw64_includedir}/pw3270cpp.h
206 %{_mingw64_libdir}/libpw3270cpp.a 207 %{_mingw64_libdir}/libpw3270cpp.a
207 208
208 -#%dir %{_mingw64_datadir}/pw3270/sample  
209 -#%{_mingw64_datadir}/pw3270/sample/*  
210 -  
211 %changelog 209 %changelog
212 210