Commit f8a4295bd55a7077c14bc2d2c6488289c62b1a78
1 parent
ab0061ad
Exists in
master
and in
1 other branch
Updating windows packages.
Showing
4 changed files
with
26 additions
and
22 deletions
Show diff stats
win/x86_32/_service
... | ... | @@ -9,11 +9,10 @@ |
9 | 9 | </service> |
10 | 10 | |
11 | 11 | <!-- https://github.com/openSUSE/obs-service-extract_file --> |
12 | - <!-- service name="extract_file"> | |
12 | + <service name="extract_file"> | |
13 | 13 | <param name="archive">*.tar</param> |
14 | - <param name="files">*/win/mingw32/libv3270.spec</param> | |
15 | - <param name="outfilename">mingw32-libv3270-5_2.spec</param> | |
16 | - </service --> | |
14 | + <param name="files">*/win/x86_32/mingw32-libv3270.spec</param> | |
15 | + </service> | |
17 | 16 | |
18 | 17 | <service name="recompress"> |
19 | 18 | <param name="file">*.tar</param> | ... | ... |
win/x86_32/mingw32-libv3270.spec
... | ... | @@ -78,6 +78,9 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ |
78 | 78 | Summary: 3270 Virtual Terminal for GTK development files |
79 | 79 | Group: Development/Libraries/C and C++ |
80 | 80 | |
81 | +Requires: %{name} = %{version} | |
82 | +Requires: mingw32(pkg:lib3270) | |
83 | + | |
81 | 84 | %description devel |
82 | 85 | |
83 | 86 | 3270 Virtual Terminal for GTK development files. |
... | ... | @@ -91,7 +94,7 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ |
91 | 94 | Summary: Glade catalog for the TN3270 terminal emulator library |
92 | 95 | Group: Development/Libraries/C and C++ |
93 | 96 | |
94 | -Requires: mingw32(pkg:lib3270) | |
97 | +Requires: %{name}-devel = %{version} | |
95 | 98 | Requires: glade |
96 | 99 | |
97 | 100 | %description -n mingw32-glade-catalog-v3270 |
... | ... | @@ -126,19 +129,18 @@ make all |
126 | 129 | |
127 | 130 | %install |
128 | 131 | %{_mingw32_makeinstall} |
132 | +%_mingw32_find_lang libv3270 langfiles | |
129 | 133 | |
130 | 134 | %clean |
131 | 135 | rm -rf %{buildroot} |
132 | 136 | |
133 | 137 | #---[ Files ]--------------------------------------------------------------------------------------------------------- |
134 | 138 | |
135 | -%files | |
139 | +%files -f langfiles | |
136 | 140 | %defattr(-,root,root) |
137 | 141 | %doc AUTHORS LICENSE README.md |
138 | 142 | |
139 | -%{_mingw32_libdir}/libv3270.dll | |
140 | -%{_mingw32_libdir}/libv3270.dll.%{MAJOR_VERSION} | |
141 | -%{_mingw32_libdir}/libv3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} | |
143 | +%{_mingw32_bindir}/*.dll | |
142 | 144 | |
143 | 145 | %files devel |
144 | 146 | %defattr(-,root,root) |
... | ... | @@ -154,6 +156,8 @@ rm -rf %{buildroot} |
154 | 156 | %dir %{_mingw32_datadir}/%{_product}/remap |
155 | 157 | %{_mingw32_datadir}/%{_product}/remap/*.xml |
156 | 158 | |
159 | +%{_mingw32_datadir}/%{_product}/def/*.def | |
160 | + | |
157 | 161 | %files -n mingw32-glade-catalog-v3270 |
158 | 162 | %defattr(-,root,root) |
159 | 163 | ... | ... |
win/x86_64/_service
... | ... | @@ -9,11 +9,10 @@ |
9 | 9 | </service> |
10 | 10 | |
11 | 11 | <!-- https://github.com/openSUSE/obs-service-extract_file --> |
12 | - <!-- service name="extract_file"> | |
12 | + <service name="extract_file"> | |
13 | 13 | <param name="archive">*.tar</param> |
14 | - <param name="files">*/win/mingw64/libv3270.spec</param> | |
15 | - <param name="outfilename">mingw64-libv3270-5_2.spec</param> | |
16 | - </service --> | |
14 | + <param name="files">*/win/x86_64/mingw64-libv3270.spec</param> | |
15 | + </service> | |
17 | 16 | |
18 | 17 | <service name="recompress"> |
19 | 18 | <param name="file">*.tar</param> | ... | ... |
win/x86_64/mingw64-libv3270.spec
... | ... | @@ -28,16 +28,16 @@ |
28 | 28 | #---[ Main package ]-------------------------------------------------------------------------------------------------- |
29 | 29 | |
30 | 30 | Summary: 3270 Virtual Terminal for GTK |
31 | -Name: mingw64-libv3270 | |
32 | -Version: 5.2 | |
31 | +Name: mingw64-libv3270 | |
32 | +Version: 5.2 | |
33 | 33 | |
34 | 34 | %define MAJOR_VERSION %(echo %{version} | cut -d. -f1) |
35 | 35 | %define MINOR_VERSION %(echo %{version} | cut -d. -f2) |
36 | 36 | %define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} |
37 | 37 | %define _product %(x86_64-w64-mingw32-pkg-config --variable=product_name lib3270) |
38 | 38 | |
39 | -Release: 0 | |
40 | -License: GPL-2.0 | |
39 | +Release: 0 | |
40 | +License: GPL-2.0 | |
41 | 41 | |
42 | 42 | Source: libv3270-%{version}.tar.xz |
43 | 43 | |
... | ... | @@ -94,7 +94,7 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ |
94 | 94 | Summary: Glade catalog for the TN3270 terminal emulator library |
95 | 95 | Group: Development/Libraries/C and C++ |
96 | 96 | |
97 | -Requires: libv3270-devel = %{version} | |
97 | +Requires: %{name}-devel = %{version} | |
98 | 98 | Requires: glade |
99 | 99 | |
100 | 100 | %description -n mingw64-glade-catalog-v3270 |
... | ... | @@ -129,19 +129,18 @@ make all |
129 | 129 | |
130 | 130 | %install |
131 | 131 | %{_mingw64_makeinstall} |
132 | +%_mingw64_find_lang libv3270 langfiles | |
132 | 133 | |
133 | 134 | %clean |
134 | 135 | rm -rf %{buildroot} |
135 | 136 | |
136 | 137 | #---[ Files ]--------------------------------------------------------------------------------------------------------- |
137 | 138 | |
138 | -%files | |
139 | +%files -f langfiles | |
139 | 140 | %defattr(-,root,root) |
140 | 141 | %doc AUTHORS LICENSE README.md |
141 | 142 | |
142 | -%{_mingw64_libdir}/libv3270.dll | |
143 | -%{_mingw64_libdir}/libv3270.dll.%{MAJOR_VERSION} | |
144 | -%{_mingw64_libdir}/libv3270.dll.%{MAJOR_VERSION}.%{MINOR_VERSION} | |
143 | +%{_mingw64_bindir}/*.dll | |
145 | 144 | |
146 | 145 | %files devel |
147 | 146 | %defattr(-,root,root) |
... | ... | @@ -150,12 +149,15 @@ rm -rf %{buildroot} |
150 | 149 | |
151 | 150 | %{_mingw64_libdir}/pkgconfig/*.pc |
152 | 151 | %{_mingw64_libdir}/*.a |
152 | + | |
153 | 153 | %{_mingw64_datadir}/%{_product}/pot/*.pot |
154 | 154 | %{_mingw64_datadir}/%{_product}/colors.conf |
155 | 155 | |
156 | 156 | %dir %{_mingw64_datadir}/%{_product}/remap |
157 | 157 | %{_mingw64_datadir}/%{_product}/remap/*.xml |
158 | 158 | |
159 | +%{_mingw64_datadir}/%{_product}/def/*.def | |
160 | + | |
159 | 161 | %files -n mingw64-glade-catalog-v3270 |
160 | 162 | %defattr(-,root,root) |
161 | 163 | ... | ... |