Download as
Browse Code »

Commit 6ac37a050f55a17eaa6e973c3ac6929c29bc2795

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

Updating mingw packages.

Showing 4 changed files with 16 additions and 12 deletions   Show diff stats
win/x86_32/_service
  Diff comments   View file @6ac37a0
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py --> 3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py -->
4 <service name="tar_scm"> 4 <service name="tar_scm">
5 <param name="changesgenerate">enable</param> 5 <param name="changesgenerate">enable</param>
6 - <param name="sslverify">disable</param>  
7 <param name="versionformat">@PARENT_TAG@</param> 6 <param name="versionformat">@PARENT_TAG@</param>
8 <param name="url">https://github.com/PerryWerneck/libv3270.git</param> 7 <param name="url">https://github.com/PerryWerneck/libv3270.git</param>
9 <param name="scm">git</param> 8 <param name="scm">git</param>
@@ -13,7 +12,7 @@ @@ -13,7 +12,7 @@
13 <!-- service name="extract_file"> 12 <!-- service name="extract_file">
14 <param name="archive">*.tar</param> 13 <param name="archive">*.tar</param>
15 <param name="files">*/win/mingw32/libv3270.spec</param> 14 <param name="files">*/win/mingw32/libv3270.spec</param>
16 - <param name="outfilename">mingw32-libv3270.spec</param> 15 + <param name="outfilename">mingw32-libv3270-5_2.spec</param>
17 </service --> 16 </service -->
18 17
19 <service name="recompress"> 18 <service name="recompress">
win/x86_32/mingw32-libv3270.spec
  Diff comments   View file @6ac37a0
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 %define MINOR_VERSION 2 20 %define MINOR_VERSION 2
21 21
22 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 22 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  23 +%define _product %(i686-w64-mingw32-pkg-config --variable=product_name lib3270)
23 24
24 %define __strip %{_mingw32_strip} 25 %define __strip %{_mingw32_strip}
25 %define __objdump %{_mingw32_objdump} 26 %define __objdump %{_mingw32_objdump}
@@ -39,7 +40,7 @@ License: GPL-2.0 @@ -39,7 +40,7 @@ License: GPL-2.0
39 40
40 Source: libv3270-%{version}.tar.xz 41 Source: libv3270-%{version}.tar.xz
41 42
42 -Url: https://portal.softwarepublico.gov.br/social/pw3270/ 43 +Url: https://github.com/PerryWerneck/libv3270.git
43 44
44 Group: Development/Libraries/C and C++ 45 Group: Development/Libraries/C and C++
45 BuildRoot: /var/tmp/%{name}-%{version} 46 BuildRoot: /var/tmp/%{name}-%{version}
@@ -67,7 +68,7 @@ BuildRequires: mingw32(pkg:gtk+-win32-3.0) @@ -67,7 +68,7 @@ BuildRequires: mingw32(pkg:gtk+-win32-3.0)
67 BuildRequires: mingw32(lib:iconv) 68 BuildRequires: mingw32(lib:iconv)
68 BuildRequires: mingw32(lib:intl) 69 BuildRequires: mingw32(lib:intl)
69 70
70 -BuildRequires: mingw32-lib3270-devel = %{MAJOR_VERSION}.%{MINOR_VERSION} 71 +BuildRequires: mingw32-lib3270-%{_libvrs}-devel
71 72
72 %description 73 %description
73 74
@@ -132,7 +133,7 @@ make all @@ -132,7 +133,7 @@ make all
132 133
133 %{_mingw32_strip} \ 134 %{_mingw32_strip} \
134 --strip-all \ 135 --strip-all \
135 - .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} 136 + .bin/Release/*.dll
136 137
137 %install 138 %install
138 %{_mingw32_makeinstall} 139 %{_mingw32_makeinstall}
@@ -158,7 +159,8 @@ rm -rf %{buildroot} @@ -158,7 +159,8 @@ rm -rf %{buildroot}
158 %{_mingw32_libdir}/pkgconfig/*.pc 159 %{_mingw32_libdir}/pkgconfig/*.pc
159 %{_mingw32_libdir}/*.a 160 %{_mingw32_libdir}/*.a
160 161
161 -%{_mingw32_datadir}/pw3270/pot/*.pot 162 +%{_mingw32_datadir}/%{_product}/pot/*.pot
  163 +%{_mingw32_datadir}/%{_product}/colors.conf
162 164
163 %files -n mingw32-glade-catalog-v3270 165 %files -n mingw32-glade-catalog-v3270
164 %defattr(-,root,root) 166 %defattr(-,root,root)
win/x86_64/_service
  Diff comments   View file @6ac37a0
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py --> 3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py -->
4 <service name="tar_scm"> 4 <service name="tar_scm">
5 <param name="changesgenerate">enable</param> 5 <param name="changesgenerate">enable</param>
6 - <param name="sslverify">disable</param>  
7 <param name="versionformat">@PARENT_TAG@</param> 6 <param name="versionformat">@PARENT_TAG@</param>
8 <param name="url">https://github.com/PerryWerneck/libv3270.git</param> 7 <param name="url">https://github.com/PerryWerneck/libv3270.git</param>
9 <param name="scm">git</param> 8 <param name="scm">git</param>
@@ -13,7 +12,7 @@ @@ -13,7 +12,7 @@
13 <!-- service name="extract_file"> 12 <!-- service name="extract_file">
14 <param name="archive">*.tar</param> 13 <param name="archive">*.tar</param>
15 <param name="files">*/win/mingw64/libv3270.spec</param> 14 <param name="files">*/win/mingw64/libv3270.spec</param>
16 - <param name="outfilename">mingw64-libv3270.spec</param> 15 + <param name="outfilename">mingw64-libv3270-5_2.spec</param>
17 </service --> 16 </service -->
18 17
19 <service name="recompress"> 18 <service name="recompress">
@@ -24,4 +23,3 @@ @@ -24,4 +23,3 @@
24 <service name="set_version" /> 23 <service name="set_version" />
25 24
26 </services> 25 </services>
27 -  
win/x86_64/mingw64-libv3270.spec
  Diff comments   View file @6ac37a0
@@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
20 %define MINOR_VERSION 2 20 %define MINOR_VERSION 2
21 21
22 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} 22 %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
  23 +%define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270)
23 24
24 %define __strip %{_mingw64_strip} 25 %define __strip %{_mingw64_strip}
25 %define __objdump %{_mingw64_objdump} 26 %define __objdump %{_mingw64_objdump}
@@ -39,7 +40,7 @@ License: GPL-2.0 @@ -39,7 +40,7 @@ License: GPL-2.0
39 40
40 Source: libv3270-%{version}.tar.xz 41 Source: libv3270-%{version}.tar.xz
41 42
42 -Url: https://portal.softwarepublico.gov.br/social/pw3270/ 43 +Url: https://github.com/PerryWerneck/libv3270.git
43 44
44 Group: Development/Libraries/C and C++ 45 Group: Development/Libraries/C and C++
45 BuildRoot: /var/tmp/%{name}-%{version} 46 BuildRoot: /var/tmp/%{name}-%{version}
@@ -47,6 +48,9 @@ BuildRoot: /var/tmp/%{name}-%{version} @@ -47,6 +48,9 @@ BuildRoot: /var/tmp/%{name}-%{version}
47 Provides: mingw64-libv3270 48 Provides: mingw64-libv3270
48 Conflicts: otherproviders(mingw64-libv3270) 49 Conflicts: otherproviders(mingw64-libv3270)
49 50
  51 +Provides: mingw64(lib:v3270)
  52 +Provides: mingw64(lib:v3270-%{_libvrs})
  53 +
50 BuildRequires: autoconf 54 BuildRequires: autoconf
51 BuildRequires: automake 55 BuildRequires: automake
52 BuildRequires: gettext-tools 56 BuildRequires: gettext-tools
@@ -129,7 +133,7 @@ make all @@ -129,7 +133,7 @@ make all
129 133
130 %{_mingw64_strip} \ 134 %{_mingw64_strip} \
131 --strip-all \ 135 --strip-all \
132 - .bin/Release/*.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} 136 + .bin/Release/*.dll
133 137
134 %install 138 %install
135 %{_mingw64_makeinstall} 139 %{_mingw64_makeinstall}
@@ -154,7 +158,8 @@ rm -rf %{buildroot} @@ -154,7 +158,8 @@ rm -rf %{buildroot}
154 158
155 %{_mingw64_libdir}/pkgconfig/*.pc 159 %{_mingw64_libdir}/pkgconfig/*.pc
156 %{_mingw64_libdir}/*.a 160 %{_mingw64_libdir}/*.a
157 -%{_mingw64_datadir}/pw3270/pot/*.pot 161 +%{_mingw64_datadir}/%{_product}/pot/*.pot
  162 +%{_mingw64_datadir}/%{_product}/colors.conf
158 163
159 %files -n mingw64-glade-catalog-v3270 164 %files -n mingw64-glade-catalog-v3270
160 %defattr(-,root,root) 165 %defattr(-,root,root)