Download as
Browse Code »

Commit 28bb7bb7022adbb21ec01bc1f076a6afffc6c4fa

Authored by Perry Werneck
1 parent 795e38f3
Exists in master and in 1 other branch develop

Updating package & devels.

Showing 4 changed files with 14 additions and 23 deletions   Show diff stats
client/src/core/windows/dynamic/init.cc
  Diff comments   View file @28bb7bb
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 38
39 #include <config.h> 39 #include <config.h>
40 #include <ipc-client-internals.h> 40 #include <ipc-client-internals.h>
  41 + #include <delayimp.h>
41 #include <fcntl.h> 42 #include <fcntl.h>
42 43
43 extern "C" { 44 extern "C" {
client/src/include/lib3270/ipc.h
  Diff comments   View file @28bb7bb
@@ -40,8 +40,6 @@ @@ -40,8 +40,6 @@
40 40
41 #if defined(_WIN32) 41 #if defined(_WIN32)
42 42
43 - #include <delayimp.h>  
44 -  
45 #define TN3270_PUBLIC __declspec (dllexport) 43 #define TN3270_PUBLIC __declspec (dllexport)
46 #define TN3270_PRIVATE 44 #define TN3270_PRIVATE
47 45
win/mingw32/mingw32-pw3270-plugin-ipc.spec
  Diff comments   View file @28bb7bb
@@ -16,14 +16,6 @@ @@ -16,14 +16,6 @@
16 # Please submit bugfixes or comments via http://bugs.opensuse.org/ 16 # Please submit bugfixes or comments via http://bugs.opensuse.org/
17 # 17 #
18 18
19 -#---[ Versions ]------------------------------------------------------------------------------------------------------  
20 -  
21 -%define MAJOR_VERSION 5  
22 -%define MINOR_VERSION 2  
23 -  
24 -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}  
25 -%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)  
26 -  
27 %define __strip %{_mingw32_strip} 19 %define __strip %{_mingw32_strip}
28 %define __objdump %{_mingw32_objdump} 20 %define __objdump %{_mingw32_objdump}
29 %define _use_internal_dependency_generator 0 21 %define _use_internal_dependency_generator 0
@@ -37,6 +29,12 @@ @@ -37,6 +29,12 @@
37 Summary: D-Bus based IPC plugin for pw3270 29 Summary: D-Bus based IPC plugin for pw3270
38 Name: mingw32-pw3270-plugin-ipc 30 Name: mingw32-pw3270-plugin-ipc
39 Version: 5.2 31 Version: 5.2
  32 +
  33 +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
  34 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  35 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  36 +%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)
  37 +
40 Release: 0 38 Release: 0
41 License: LGPL-3.0 39 License: LGPL-3.0
42 Source: pw3270-plugin-ipc-%{version}.tar.xz 40 Source: pw3270-plugin-ipc-%{version}.tar.xz
@@ -49,8 +47,6 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -49,8 +47,6 @@ BuildRoot: /var/tmp/%{name}-%{version}
49 Provides: mingw32-lib3270-ipc-service 47 Provides: mingw32-lib3270-ipc-service
50 Conflicts: otherproviders(mingw32-lib3270-ipc-service) 48 Conflicts: otherproviders(mingw32-lib3270-ipc-service)
51 49
52 -BuildRequires: mingw32-lib3270-devel >= 5.2  
53 -BuildRequires: mingw32-libv3270-devel >= 5.2  
54 BuildRequires: autoconf >= 2.61 50 BuildRequires: autoconf >= 2.61
55 BuildRequires: automake 51 BuildRequires: automake
56 BuildRequires: binutils 52 BuildRequires: binutils
win/mingw64/mingw64-pw3270-plugin-ipc.spec
  Diff comments   View file @28bb7bb
@@ -16,15 +16,6 @@ @@ -16,15 +16,6 @@
16 # Please submit bugfixes or comments via http://bugs.opensuse.org/ 16 # Please submit bugfixes or comments via http://bugs.opensuse.org/
17 # 17 #
18 18
19 -#---[ Versions ]------------------------------------------------------------------------------------------------------  
20 -  
21 -%define MAJOR_VERSION 5  
22 -%define MINOR_VERSION 2  
23 -  
24 -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}  
25 -%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)  
26 -  
27 -  
28 %define __strip %{_mingw64_strip} 19 %define __strip %{_mingw64_strip}
29 %define __objdump %{_mingw64_objdump} 20 %define __objdump %{_mingw64_objdump}
30 %define _use_internal_dependency_generator 0 21 %define _use_internal_dependency_generator 0
@@ -38,6 +29,13 @@ @@ -38,6 +29,13 @@
38 Summary: D-Bus based IPC plugin for pw3270 29 Summary: D-Bus based IPC plugin for pw3270
39 Name: mingw64-pw3270-plugin-ipc 30 Name: mingw64-pw3270-plugin-ipc
40 Version: 5.2 31 Version: 5.2
  32 +
  33 +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
  34 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  35 +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  36 +%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)
  37 +
  38 +
41 Release: 0 39 Release: 0
42 License: LGPL-3.0 40 License: LGPL-3.0
43 Source: pw3270-plugin-ipc-%{version}.tar.xz 41 Source: pw3270-plugin-ipc-%{version}.tar.xz
@@ -50,8 +48,6 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -50,8 +48,6 @@ BuildRoot: /var/tmp/%{name}-%{version}
50 Provides: mingw64-lib3270-ipc-service 48 Provides: mingw64-lib3270-ipc-service
51 Conflicts: otherproviders(mingw64-lib3270-ipc-service) 49 Conflicts: otherproviders(mingw64-lib3270-ipc-service)
52 50
53 -BuildRequires: mingw64-lib3270-devel >= 5.2  
54 -BuildRequires: mingw64-libv3270-devel >= 5.2  
55 BuildRequires: autoconf >= 2.61 51 BuildRequires: autoconf >= 2.61
56 BuildRequires: automake 52 BuildRequires: automake
57 BuildRequires: binutils 53 BuildRequires: binutils