diff --git a/win/x86_32/_service b/win/x86_32/_service index afc155b..993d420 100644 --- a/win/x86_32/_service +++ b/win/x86_32/_service @@ -3,7 +3,6 @@ enable - disable @PARENT_TAG@ https://github.com/PerryWerneck/libv3270.git git @@ -13,7 +12,7 @@ diff --git a/win/x86_32/mingw32-libv3270.spec b/win/x86_32/mingw32-libv3270.spec index b636861..eaa7bec 100644 --- a/win/x86_32/mingw32-libv3270.spec +++ b/win/x86_32/mingw32-libv3270.spec @@ -20,6 +20,7 @@ %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} @@ -39,7 +40,7 @@ License: GPL-2.0 Source: libv3270-%{version}.tar.xz -Url: https://portal.softwarepublico.gov.br/social/pw3270/ +Url: https://github.com/PerryWerneck/libv3270.git Group: Development/Libraries/C and C++ BuildRoot: /var/tmp/%{name}-%{version} @@ -67,7 +68,7 @@ BuildRequires: mingw32(pkg:gtk+-win32-3.0) BuildRequires: mingw32(lib:iconv) BuildRequires: mingw32(lib:intl) -BuildRequires: mingw32-lib3270-devel = %{MAJOR_VERSION}.%{MINOR_VERSION} +BuildRequires: mingw32-lib3270-%{_libvrs}-devel %description @@ -132,7 +133,7 @@ make all %{_mingw32_strip} \ --strip-all \ - .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} + .bin/Release/*.dll %install %{_mingw32_makeinstall} @@ -158,7 +159,8 @@ rm -rf %{buildroot} %{_mingw32_libdir}/pkgconfig/*.pc %{_mingw32_libdir}/*.a -%{_mingw32_datadir}/pw3270/pot/*.pot +%{_mingw32_datadir}/%{_product}/pot/*.pot +%{_mingw32_datadir}/%{_product}/colors.conf %files -n mingw32-glade-catalog-v3270 %defattr(-,root,root) diff --git a/win/x86_64/_service b/win/x86_64/_service index 6b0a8a8..1278481 100644 --- a/win/x86_64/_service +++ b/win/x86_64/_service @@ -3,7 +3,6 @@ enable - disable @PARENT_TAG@ https://github.com/PerryWerneck/libv3270.git git @@ -13,7 +12,7 @@ @@ -24,4 +23,3 @@ - diff --git a/win/x86_64/mingw64-libv3270.spec b/win/x86_64/mingw64-libv3270.spec index 7d08fdf..9d8dee2 100644 --- a/win/x86_64/mingw64-libv3270.spec +++ b/win/x86_64/mingw64-libv3270.spec @@ -20,6 +20,7 @@ %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} @@ -39,7 +40,7 @@ License: GPL-2.0 Source: libv3270-%{version}.tar.xz -Url: https://portal.softwarepublico.gov.br/social/pw3270/ +Url: https://github.com/PerryWerneck/libv3270.git Group: Development/Libraries/C and C++ BuildRoot: /var/tmp/%{name}-%{version} @@ -47,6 +48,9 @@ BuildRoot: /var/tmp/%{name}-%{version} Provides: mingw64-libv3270 Conflicts: otherproviders(mingw64-libv3270) +Provides: mingw64(lib:v3270) +Provides: mingw64(lib:v3270-%{_libvrs}) + BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-tools @@ -129,7 +133,7 @@ make all %{_mingw64_strip} \ --strip-all \ - .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} + .bin/Release/*.dll %install %{_mingw64_makeinstall} @@ -154,7 +158,8 @@ rm -rf %{buildroot} %{_mingw64_libdir}/pkgconfig/*.pc %{_mingw64_libdir}/*.a -%{_mingw64_datadir}/pw3270/pot/*.pot +%{_mingw64_datadir}/%{_product}/pot/*.pot +%{_mingw64_datadir}/%{_product}/colors.conf %files -n mingw64-glade-catalog-v3270 %defattr(-,root,root) -- libgit2 0.21.2