Commit ac5e2b917fc6bca3991dc0d1d323e08c3637850f
1 parent
8ae01622
Exists in
master
and in
1 other branch
Updating mingw rpm packages.
Showing
2 changed files
with
7 additions
and
4 deletions
Show diff stats
win/mingw32/mingw32-pw3270-plugin-ipc.spec
| ... | ... | @@ -22,6 +22,7 @@ |
| 22 | 22 | %define MINOR_VERSION 2 |
| 23 | 23 | |
| 24 | 24 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
| 25 | +%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270) | |
| 25 | 26 | |
| 26 | 27 | %define __strip %{_mingw32_strip} |
| 27 | 28 | %define __objdump %{_mingw32_objdump} |
| ... | ... | @@ -136,8 +137,8 @@ rm -rf $RPM_BUILD_ROOT |
| 136 | 137 | %doc AUTHORS README.md LICENSE |
| 137 | 138 | %endif |
| 138 | 139 | |
| 139 | -%dir %{_mingw32_libdir}/pw3270-plugins | |
| 140 | -%{_mingw32_libdir}/pw3270-plugins/ipcserver.dll | |
| 140 | +%dir %{_mingw32_libdir}/%{_product}-plugins | |
| 141 | +%{_mingw32_libdir}/%{_product}-plugins/ipcserver.dll | |
| 141 | 142 | |
| 142 | 143 | %files -n mingw32-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION} |
| 143 | 144 | %defattr(-,root,root) | ... | ... |
win/mingw64/mingw64-pw3270-plugin-ipc.spec
| ... | ... | @@ -22,6 +22,8 @@ |
| 22 | 22 | %define MINOR_VERSION 2 |
| 23 | 23 | |
| 24 | 24 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
| 25 | +%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270) | |
| 26 | + | |
| 25 | 27 | |
| 26 | 28 | %define __strip %{_mingw64_strip} |
| 27 | 29 | %define __objdump %{_mingw64_objdump} |
| ... | ... | @@ -136,8 +138,8 @@ rm -rf $RPM_BUILD_ROOT |
| 136 | 138 | %doc AUTHORS README.md LICENSE |
| 137 | 139 | %endif |
| 138 | 140 | |
| 139 | -%dir %{_mingw64_libdir}/pw3270-plugins | |
| 140 | -%{_mingw64_libdir}/pw3270-plugins/ipcserver.dll | |
| 141 | +%dir %{_mingw64_libdir}/%{_product}-plugins | |
| 142 | +%{_mingw64_libdir}/%{_product}-plugins/ipcserver.dll | |
| 141 | 143 | |
| 142 | 144 | %files -n mingw64-libipc3270-%{MAJOR_VERSION}_%{MINOR_VERSION} |
| 143 | 145 | %defattr(-,root,root) | ... | ... |