Download as
Browse Code »

Commit e9dcaea167a3af5163b2844473a4d6a427e056ca

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

Updating win32 package.

Showing 2 changed files with 15 additions and 9 deletions   Show diff stats
win/x86_32/mingw32-libv3270.spec
  Diff comments   View file @e9dcaea
@@ -32,7 +32,7 @@ Name: mingw32-libv3270 @@ -32,7 +32,7 @@ Name: mingw32-libv3270
32 Version: 5.2 32 Version: 5.2
33 33
34 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) 34 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
35 -%define MINOR_VERSION %(echo %{version} | cut -d. -f2) 35 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2 | cut -d+ -f1)
36 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 36 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
37 %define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270) 37 %define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)
38 38
@@ -48,8 +48,12 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -48,8 +48,12 @@ BuildRoot: /var/tmp/%{name}-%{version}
48 48
49 Provides: mingw32(lib:v3270) 49 Provides: mingw32(lib:v3270)
50 50
  51 +Requires: mingw32(libgdk_pixbuf-2.0-0.dll)
  52 +BuildRequires: mingw32(pkg:gdk-pixbuf-2.0)
  53 +
51 BuildRequires: autoconf 54 BuildRequires: autoconf
52 BuildRequires: automake 55 BuildRequires: automake
  56 +BuildRequires: libtool
53 BuildRequires: gettext-tools 57 BuildRequires: gettext-tools
54 BuildRequires: pkgconfig(glib-2.0) 58 BuildRequires: pkgconfig(glib-2.0)
55 59
@@ -129,7 +133,7 @@ make all @@ -129,7 +133,7 @@ make all
129 133
130 %install 134 %install
131 %{_mingw32_makeinstall} 135 %{_mingw32_makeinstall}
132 -%_mingw32_find_lang libv3270 langfiles 136 +%_mingw32_find_lang libv3270-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
133 137
134 %clean 138 %clean
135 rm -rf %{buildroot} 139 rm -rf %{buildroot}
@@ -141,6 +145,9 @@ rm -rf %{buildroot} @@ -141,6 +145,9 @@ rm -rf %{buildroot}
141 %doc AUTHORS LICENSE README.md 145 %doc AUTHORS LICENSE README.md
142 146
143 %{_mingw32_bindir}/*.dll 147 %{_mingw32_bindir}/*.dll
  148 +%{_mingw32_datadir}/%{_product}/colors.conf
  149 +%dir %{_mingw32_datadir}/%{_product}/remap
  150 +%{_mingw32_datadir}/%{_product}/remap/*.xml
144 151
145 %files devel 152 %files devel
146 %defattr(-,root,root) 153 %defattr(-,root,root)
@@ -151,11 +158,6 @@ rm -rf %{buildroot} @@ -151,11 +158,6 @@ rm -rf %{buildroot}
151 %{_mingw32_libdir}/*.a 158 %{_mingw32_libdir}/*.a
152 159
153 %{_mingw32_datadir}/%{_product}/pot/*.pot 160 %{_mingw32_datadir}/%{_product}/pot/*.pot
154 -%{_mingw32_datadir}/%{_product}/colors.conf  
155 -  
156 -%dir %{_mingw32_datadir}/%{_product}/remap  
157 -%{_mingw32_datadir}/%{_product}/remap/*.xml  
158 -  
159 %{_mingw32_datadir}/%{_product}/def/*.def 161 %{_mingw32_datadir}/%{_product}/def/*.def
160 162
161 %files -n mingw32-glade-catalog-v3270 163 %files -n mingw32-glade-catalog-v3270
win/x86_64/mingw64-libv3270.spec
  Diff comments   View file @e9dcaea
@@ -32,7 +32,7 @@ Name: mingw64-libv3270 @@ -32,7 +32,7 @@ Name: mingw64-libv3270
32 Version: 5.2 32 Version: 5.2
33 33
34 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) 34 %define MAJOR_VERSION %(echo %{version} | cut -d. -f1)
35 -%define MINOR_VERSION %(echo %{version} | cut -d. -f2) 35 +%define MINOR_VERSION %(echo %{version} | cut -d. -f2 | cut -d+ -f1)
36 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 36 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
37 %define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270) 37 %define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)
38 38
@@ -48,8 +48,12 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -48,8 +48,12 @@ BuildRoot: /var/tmp/%{name}-%{version}
48 48
49 Provides: mingw64(lib:v3270) 49 Provides: mingw64(lib:v3270)
50 50
  51 +Requires: mingw64(libgdk_pixbuf-2.0-0.dll)
  52 +BuildRequires: mingw64(pkg:gdk-pixbuf-2.0)
  53 +
51 BuildRequires: autoconf 54 BuildRequires: autoconf
52 BuildRequires: automake 55 BuildRequires: automake
  56 +BuildRequires: libtool
53 BuildRequires: gettext-tools 57 BuildRequires: gettext-tools
54 BuildRequires: pkgconfig(glib-2.0) 58 BuildRequires: pkgconfig(glib-2.0)
55 59
@@ -129,7 +133,7 @@ make all @@ -129,7 +133,7 @@ make all
129 133
130 %install 134 %install
131 %{_mingw64_makeinstall} 135 %{_mingw64_makeinstall}
132 -%_mingw64_find_lang libv3270 langfiles 136 +%_mingw64_find_lang libv3270-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
133 137
134 %clean 138 %clean
135 rm -rf %{buildroot} 139 rm -rf %{buildroot}