diff --git a/client/src/core/windows/dynamic/init.cc b/client/src/core/windows/dynamic/init.cc index 44421a6..74d393d 100644 --- a/client/src/core/windows/dynamic/init.cc +++ b/client/src/core/windows/dynamic/init.cc @@ -38,6 +38,7 @@ #include #include + #include #include extern "C" { diff --git a/client/src/include/lib3270/ipc.h b/client/src/include/lib3270/ipc.h index b167008..a800796 100644 --- a/client/src/include/lib3270/ipc.h +++ b/client/src/include/lib3270/ipc.h @@ -40,8 +40,6 @@ #if defined(_WIN32) - #include - #define TN3270_PUBLIC __declspec (dllexport) #define TN3270_PRIVATE diff --git a/win/mingw32/mingw32-pw3270-plugin-ipc.spec b/win/mingw32/mingw32-pw3270-plugin-ipc.spec index a6cf19e..c7f12a5 100644 --- a/win/mingw32/mingw32-pw3270-plugin-ipc.spec +++ b/win/mingw32/mingw32-pw3270-plugin-ipc.spec @@ -16,14 +16,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -#---[ Versions ]------------------------------------------------------------------------------------------------------ - -%define MAJOR_VERSION 5 -%define MINOR_VERSION 2 - -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} -%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270) - %define __strip %{_mingw32_strip} %define __objdump %{_mingw32_objdump} %define _use_internal_dependency_generator 0 @@ -37,6 +29,12 @@ Summary: D-Bus based IPC plugin for pw3270 Name: mingw32-pw3270-plugin-ipc Version: 5.2 + +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1) +%define MINOR_VERSION %(echo %{version} | cut -d. -f2) +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} +%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270) + Release: 0 License: LGPL-3.0 Source: pw3270-plugin-ipc-%{version}.tar.xz @@ -49,8 +47,6 @@ BuildRoot: /var/tmp/%{name}-%{version} Provides: mingw32-lib3270-ipc-service Conflicts: otherproviders(mingw32-lib3270-ipc-service) -BuildRequires: mingw32-lib3270-devel >= 5.2 -BuildRequires: mingw32-libv3270-devel >= 5.2 BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: binutils diff --git a/win/mingw64/mingw64-pw3270-plugin-ipc.spec b/win/mingw64/mingw64-pw3270-plugin-ipc.spec index 95fbc2b..f220e09 100644 --- a/win/mingw64/mingw64-pw3270-plugin-ipc.spec +++ b/win/mingw64/mingw64-pw3270-plugin-ipc.spec @@ -16,15 +16,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -#---[ Versions ]------------------------------------------------------------------------------------------------------ - -%define MAJOR_VERSION 5 -%define MINOR_VERSION 2 - -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} -%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270) - - %define __strip %{_mingw64_strip} %define __objdump %{_mingw64_objdump} %define _use_internal_dependency_generator 0 @@ -38,6 +29,13 @@ Summary: D-Bus based IPC plugin for pw3270 Name: mingw64-pw3270-plugin-ipc Version: 5.2 + +%define MAJOR_VERSION %(echo %{version} | cut -d. -f1) +%define MINOR_VERSION %(echo %{version} | cut -d. -f2) +%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} +%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270) + + Release: 0 License: LGPL-3.0 Source: pw3270-plugin-ipc-%{version}.tar.xz @@ -50,8 +48,6 @@ BuildRoot: /var/tmp/%{name}-%{version} Provides: mingw64-lib3270-ipc-service Conflicts: otherproviders(mingw64-lib3270-ipc-service) -BuildRequires: mingw64-lib3270-devel >= 5.2 -BuildRequires: mingw64-libv3270-devel >= 5.2 BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: binutils -- libgit2 0.21.2