Download as
Browse Code »

Commit c764cf961c71248001ca36726f1a7883fa213000

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

Updating windows package.

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