Commit c764cf961c71248001ca36726f1a7883fa213000

Authored by Perry Werneck
1 parent 8d0d43f1
Exists in master and in 2 other branches develop, macos

Updating windows package.

win/x86_32/mingw32-lib3270.spec
... ... @@ -44,6 +44,7 @@ BuildRoot: /var/tmp/%{name}-%{version}
44 44  
45 45 BuildRequires: autoconf >= 2.61
46 46 BuildRequires: automake
  47 +BuildRequires: libtool
47 48 BuildRequires: gettext-devel
48 49 BuildRequires: xz
49 50 BuildRequires: fdupes
... ... @@ -66,7 +67,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ .
66 67 #---[ Library ]-------------------------------------------------------------------------------------------------------
67 68  
68 69 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
69   -%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  70 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2 | cut -d+ -f1)
70 71 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
71 72  
72 73 %package -n %{name}-%{_libvrs}
... ... @@ -111,7 +112,7 @@ make all %{?_smp_mflags}
111 112 #%{_mingw64_makeinstall}
112 113 make DESTDIR=%{buildroot} install
113 114  
114   -%_mingw32_find_lang %{_libname} langfiles
  115 +%_mingw32_find_lang %{_libname}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
115 116 %fdupes %{buildroot}
116 117  
117 118 %files -n %{name}-%{_libvrs} -f langfiles
... ...
win/x86_64/mingw64-lib3270.spec
... ... @@ -44,6 +44,7 @@ BuildRoot: /var/tmp/%{name}-%{version}
44 44  
45 45 BuildRequires: autoconf >= 2.61
46 46 BuildRequires: automake
  47 +BuildRequires: libtool
47 48 BuildRequires: gettext-devel
48 49 BuildRequires: xz
49 50 BuildRequires: fdupes
... ... @@ -66,7 +67,7 @@ For more details, see https://softwarepublico.gov.br/social/pw3270/ .
66 67 #---[ Library ]-------------------------------------------------------------------------------------------------------
67 68  
68 69 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
69   -%define MINOR_VERSION %(echo %{version} | cut -d. -f2)
  70 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2 | cut -d+ -f1)
70 71 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
71 72  
72 73 %package -n %{name}-%{_libvrs}
... ... @@ -111,7 +112,7 @@ make all %{?_smp_mflags}
111 112 #%{_mingw64_makeinstall}
112 113 make DESTDIR=%{buildroot} install
113 114  
114   -%_mingw64_find_lang %{_libname} langfiles
  115 +%_mingw64_find_lang %{_libname}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
115 116 %fdupes %{buildroot}
116 117  
117 118 %files -n %{name}-%{_libvrs} -f langfiles
... ...