Download as
Browse Code »

Commit 248cab7f13036a12b9d0bad637b11a44a8c79c7b

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

Updating package info.

Showing 3 changed files with 48 additions and 46 deletions   Show diff stats
rpm/pw3270-plugin-ipc.spec
  Diff comments   View file @248cab7
... ... @@ -149,6 +149,8 @@ rm -rf $RPM_BUILD_ROOT
149 149 %files -n libipc3270-devel
150 150 %defattr(-,root,root)
151 151 %{_includedir}/lib3270/ipc.h
  152 +%dir %{_includedir}/lib3270/ipc
  153 +%{_includedir}/lib3270/ipc/*.h
152 154 %{_libdir}/libipc3270.so
153 155 %{_libdir}/pkgconfig/ipc3270.pc
154 156  
... ...
win/mingw32/mingw32-pw3270-plugin-ipc.spec
  Diff comments   View file @248cab7
... ... @@ -69,7 +69,6 @@ BuildRequires: mingw32(lib:intl)
69 69  
70 70 BuildRequires: mingw32(pkg:gtk+-win32-3.0)
71 71 BuildRequires: mingw32(pkg:lib3270)
72   -BuildRequires: mingw32(pkg:lib3270-static)
73 72 BuildRequires: mingw32(pkg:libv3270)
74 73  
75 74 %description
... ... @@ -111,8 +110,7 @@ Designed as a support tool for language bindings.
111 110  
112 111 NOCONFIGURE=1 ./autogen.sh
113 112  
114   -%{_mingw32_configure} \
115   - --without-static-lib3270
  113 +%{_mingw32_configure}
116 114  
117 115 %build
118 116 make clean
... ... @@ -150,6 +148,8 @@ rm -rf $RPM_BUILD_ROOT
150 148 %files -n mingw32-libipc3270-devel
151 149 %defattr(-,root,root)
152 150 %{_mingw32_includedir}/lib3270/ipc.h
  151 +%dir %{_mingw32_includedir}/lib3270/ipc
  152 +%{_mingw32_includedir}/lib3270/ipc/*.h
153 153 %{_mingw32_libdir}/*.a
154 154 %{_mingw32_libdir}/pkgconfig/*.pc
155 155  
... ...
win/mingw64/mingw64-pw3270-plugin-ipc.spec
  Diff comments   View file @248cab7
1 1 #
2   -# spec file for packages mingw32-pw3270-plugin-ipc
  2 +# spec file for packages mingw64-pw3270-plugin-ipc
3 3 #
4 4 # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
5 5 # Copyright (C) <2008> <Banco do Brasil S.A.>
... ... @@ -23,18 +23,18 @@
23 23  
24 24 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
25 25  
26   -%define __strip %{_mingw32_strip}
27   -%define __objdump %{_mingw32_objdump}
  26 +%define __strip %{_mingw64_strip}
  27 +%define __objdump %{_mingw64_objdump}
28 28 %define _use_internal_dependency_generator 0
29   -%define __find_requires %{_mingw32_findrequires}
30   -%define __find_provides %{_mingw32_findprovides}
31   -%define __os_install_post %{_mingw32_debug_install_post} \
32   - %{_mingw32_install_post}
  29 +%define __find_requires %{_mingw64_findrequires}
  30 +%define __find_provides %{_mingw64_findprovides}
  31 +%define __os_install_post %{_mingw64_debug_install_post} \
  32 + %{_mingw64_install_post}
33 33  
34 34 #---[ Main package ]--------------------------------------------------------------------------------------------------
35 35  
36 36 Summary: D-Bus based IPC plugin for pw3270
37   -Name: mingw32-pw3270-plugin-ipc
  37 +Name: mingw64-pw3270-plugin-ipc
38 38 Version: 5.2
39 39 Release: 0
40 40 License: LGPL-3.0
... ... @@ -45,11 +45,11 @@ Url: https://portal.softwarepublico.gov.br/social/pw3270/
45 45 Group: System/X11/Terminals
46 46 BuildRoot: /var/tmp/%{name}-%{version}
47 47  
48   -Provides: mingw32-lib3270-ipc-service
49   -Conflicts: otherproviders(mingw32-lib3270-ipc-service)
  48 +Provides: mingw64-lib3270-ipc-service
  49 +Conflicts: otherproviders(mingw64-lib3270-ipc-service)
50 50  
51   -BuildRequires: mingw32-lib3270-devel >= 5.2
52   -BuildRequires: mingw32-libv3270-devel >= 5.2
  51 +BuildRequires: mingw64-lib3270-devel >= 5.2
  52 +BuildRequires: mingw64-libv3270-devel >= 5.2
53 53 BuildRequires: autoconf >= 2.61
54 54 BuildRequires: automake
55 55 BuildRequires: binutils
... ... @@ -58,19 +58,18 @@ BuildRequires: gcc-c++
58 58 BuildRequires: gettext-devel
59 59 BuildRequires: m4
60 60  
61   -BuildRequires: mingw32-cross-binutils
62   -BuildRequires: mingw32-cross-gcc
63   -BuildRequires: mingw32-cross-gcc-c++
64   -BuildRequires: mingw32-cross-pkg-config
65   -BuildRequires: mingw32-filesystem
66   -BuildRequires: mingw32-zlib-devel
67   -BuildRequires: mingw32(lib:iconv)
68   -BuildRequires: mingw32(lib:intl)
  61 +BuildRequires: mingw64-cross-binutils
  62 +BuildRequires: mingw64-cross-gcc
  63 +BuildRequires: mingw64-cross-gcc-c++
  64 +BuildRequires: mingw64-cross-pkg-config
  65 +BuildRequires: mingw64-filesystem
  66 +BuildRequires: mingw64-zlib-devel
  67 +BuildRequires: mingw64(lib:iconv)
  68 +BuildRequires: mingw64(lib:intl)
69 69  
70   -BuildRequires: mingw32(pkg:gtk+-win32-3.0)
71   -BuildRequires: mingw32(pkg:lib3270)
72   -BuildRequires: mingw32(pkg:lib3270-static)
73   -BuildRequires: mingw32(pkg:libv3270)
  70 +BuildRequires: mingw64(pkg:gtk+-win32-3.0)
  71 +BuildRequires: mingw64(pkg:lib3270)
  72 +BuildRequires: mingw64(pkg:libv3270)
74 73  
75 74 %description
76 75  
... ... @@ -80,24 +79,24 @@ See more details at https://softwarepublico.gov.br/social/pw3270/
80 79  
81 80 #---[ IPC Library Package ]-------------------------------------------------------------------------------------------
82 81  
83   -%package -n mingw32-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
  82 +%package -n mingw64-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
84 83 Summary: IPC Library for pw3270
85 84  
86   -Recommends: mingw32-lib3270-ipc-service
87   -Provides: mingw32(lib:ipc3270)
  85 +Recommends: mingw64-lib3270-ipc-service
  86 +Provides: mingw64(lib:ipc3270)
88 87  
89   -%description -n mingw32-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
  88 +%description -n mingw64-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
90 89  
91 90 IPC client library for lib3270/pw3270.
92 91  
93 92 Designed as a support tool for language bindings.
94 93  
95   -%package -n mingw32-libipc3270-devel
  94 +%package -n mingw64-libipc3270-devel
96 95 Summary: Development files for ipc3270
97 96 Requires: libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
98 97 Requires: pkgconfig(lib3270)
99 98  
100   -%description -n mingw32-libipc3270-devel
  99 +%description -n mingw64-libipc3270-devel
101 100  
102 101 Development files for lib3270/pw3270 IPC client library.
103 102  
... ... @@ -111,14 +110,13 @@ Designed as a support tool for language bindings.
111 110  
112 111 NOCONFIGURE=1 ./autogen.sh
113 112  
114   -%{_mingw32_configure} \
115   - --without-static-lib3270
  113 +%{_mingw64_configure}
116 114  
117 115 %build
118 116 make clean
119 117 make all
120 118  
121   -%{_mingw32_strip} \
  119 +%{_mingw64_strip} \
122 120 --strip-all \
123 121 .bin/Release/*.dll
124 122  
... ... @@ -138,20 +136,22 @@ rm -rf $RPM_BUILD_ROOT
138 136 %doc AUTHORS README.md LICENSE
139 137 %endif
140 138  
141   -%dir %{_mingw32_libdir}/pw3270-plugins
142   -%{_mingw32_libdir}/pw3270-plugins/ipcserver.dll
  139 +%dir %{_mingw64_libdir}/pw3270-plugins
  140 +%{_mingw64_libdir}/pw3270-plugins/ipcserver.dll
143 141  
144   -%files -n mingw32-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
  142 +%files -n mingw64-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION}
145 143 %defattr(-,root,root)
146   -%{_mingw32_libdir}/libipc3270.dll
147   -%{_mingw32_libdir}/libipc3270.dll.%{MAJOR_VERSION}
148   -%{_mingw32_libdir}/libipc3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
  144 +%{_mingw64_libdir}/libipc3270.dll
  145 +%{_mingw64_libdir}/libipc3270.dll.%{MAJOR_VERSION}
  146 +%{_mingw64_libdir}/libipc3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION}
149 147  
150   -%files -n mingw32-libipc3270-devel
  148 +%files -n mingw64-libipc3270-devel
151 149 %defattr(-,root,root)
152   -%{_mingw32_includedir}/lib3270/ipc.h
153   -%{_mingw32_libdir}/*.a
154   -%{_mingw32_libdir}/pkgconfig/*.pc
  150 +%{_mingw64_includedir}/lib3270/ipc.h
  151 +%dir %{_mingw64_includedir}/lib3270/ipc
  152 +%{_mingw64_includedir}/lib3270/ipc/*.h
  153 +%{_mingw64_libdir}/*.a
  154 +%{_mingw64_libdir}/pkgconfig/*.pc
155 155  
156 156 %changelog
157 157  
... ...