Download as
Browse Code »

Commit a57b456c93e443ec2803f49648f14a563ec094f5

Authored by Perry Werneck
1 parent a60c1691
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing build process.

Showing 3 changed files with 56 additions and 21 deletions   Show diff stats
locale/pw3270.pot
  Diff comments   View file @a57b456
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2018-12-06 13:10-0200\n" 12 +"POT-Creation-Date: 2018-12-06 13:47-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2018-12-06 13:10-0200\n" 23 +"POT-Creation-Date: 2018-12-06 13:47-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@ msgstr &quot;&quot; @@ -31,7 +31,7 @@ msgstr &quot;&quot;
31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 31 "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
32 "Project-Id-Version: PACKAGE VERSION\n" 32 "Project-Id-Version: PACKAGE VERSION\n"
33 "Report-Msgid-Bugs-To: \n" 33 "Report-Msgid-Bugs-To: \n"
34 -"POT-Creation-Date: 2018-12-06 13:10-0200\n" 34 +"POT-Creation-Date: 2018-12-06 13:47-0200\n"
35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 35 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 36 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37 "Language-Team: LANGUAGE <LL@li.org>\n" 37 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr &quot;&quot; @@ -53,7 +53,7 @@ msgstr &quot;&quot;
53 "#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 53 "#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
54 "Project-Id-Version: PACKAGE VERSION\n" 54 "Project-Id-Version: PACKAGE VERSION\n"
55 "Report-Msgid-Bugs-To: \n" 55 "Report-Msgid-Bugs-To: \n"
56 -"POT-Creation-Date: 2018-12-06 13:10-0200\n" 56 +"POT-Creation-Date: 2018-12-06 13:47-0200\n"
57 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 57 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
58 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 58 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
59 "Language-Team: LANGUAGE <LL@li.org>\n" 59 "Language-Team: LANGUAGE <LL@li.org>\n"
modules/libv3270
  Diff comments   View file @a57b456
1 -Subproject commit d52ffd174d5911240dc50053e535518e988aa6e6 1 +Subproject commit 4cab09f65489893aa1b0815547485f79251d329a
rpm/pw3270.spec
  Diff comments   View file @a57b456
@@ -136,6 +136,7 @@ BuildRequires: sed @@ -136,6 +136,7 @@ BuildRequires: sed
136 BuildRequires: optipng 136 BuildRequires: optipng
137 BuildRequires: fdupes 137 BuildRequires: fdupes
138 BuildRequires: ImageMagick 138 BuildRequires: ImageMagick
  139 +BuildRequires: autoconf-archive
139 140
140 %if 0%{?_help2man} 141 %if 0%{?_help2man}
141 BuildRequires: help2man 142 BuildRequires: help2man
@@ -161,13 +162,25 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used @@ -161,13 +162,25 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used
161 162
162 This package contains the tn3270 protocol library for %{name}. 163 This package contains the tn3270 protocol library for %{name}.
163 164
  165 +%package -n lib3270++%{_libvrs}
  166 +Summary: 3270 Communication library for %{name}
  167 +Group: System/Libraries
  168 +Provides: lib3270 = %{version}
  169 +
  170 +Conflicts: otherproviders(lib3270++%{_libvrs})
  171 +
  172 +%description -n lib3270++%{_libvrs}
  173 +GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
  174 +
  175 +This package contains the tn3270 protocol library for %{name}.
  176 +
164 %package -n libv3270-%{_libvrs} 177 %package -n libv3270-%{_libvrs}
165 Summary: 3270 Communication library for %{name} 178 Summary: 3270 Communication library for %{name}
166 Group: System/Libraries 179 Group: System/Libraries
167 Provides: lib3270 = %{version} 180 Provides: lib3270 = %{version}
168 181
169 -Provides: lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}  
170 -Conflicts: otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}) 182 +Provides: lib3270_%{_libvrs}
  183 +Conflicts: otherproviders(lib3270_%{_libvrs})
171 184
172 %description -n libv3270-%{_libvrs} 185 %description -n libv3270-%{_libvrs}
173 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. 186 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
@@ -180,9 +193,13 @@ This package contains the tn3270 protocol library for %{name}. @@ -180,9 +193,13 @@ This package contains the tn3270 protocol library for %{name}.
180 Summary: Devel for 3270 Communication library for %{name} 193 Summary: Devel for 3270 Communication library for %{name}
181 Group: Development/Libraries/C and C++ 194 Group: Development/Libraries/C and C++
182 Requires: lib3270-%{_libvrs} = %{version} 195 Requires: lib3270-%{_libvrs} = %{version}
  196 +Requires: lib3270++%{_libvrs} = %{version}
  197 +
  198 +Provides: lib3270-%{_libvrs}-devel
  199 +Conflicts: otherproviders(lib3270-%{_libvrs}-devel)
183 200
184 -Provides: lib3270-devel = %{version}  
185 -Conflicts: otherproviders(lib3270-devel) 201 +Provides: lib3270++%{_libvrs}-devel
  202 +Conflicts: otherproviders(lib3270++%{_libvrs}-devel)
186 203
187 %description -n lib3270-devel 204 %description -n lib3270-devel
188 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. 205 GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET.
@@ -302,15 +319,24 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml @@ -302,15 +319,24 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
302 319
303 %dir %{_libdir}/pw3270-plugins 320 %dir %{_libdir}/pw3270-plugins
304 321
  322 +%defattr(-,root,root)
  323 +%{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
  324 +%{_libdir}/libpw3270.so.%{MAJOR_VERSION}
  325 +
305 %files -n lib3270-%{_libvrs} 326 %files -n lib3270-%{_libvrs}
306 %defattr(-,root,root) 327 %defattr(-,root,root)
307 %{_libdir}/lib3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION} 328 %{_libdir}/lib3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
308 %{_libdir}/lib3270.so.%{MAJOR_VERSION} 329 %{_libdir}/lib3270.so.%{MAJOR_VERSION}
309 330
310 -%files -n libpw3270-%{_libvrs} 331 +%files -n lib3270++%{_libvrs}
311 %defattr(-,root,root) 332 %defattr(-,root,root)
312 -%{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}  
313 -%{_libdir}/libpw3270.so.%{MAJOR_VERSION} 333 +%{_libdir}/lib3270++.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
  334 +%{_libdir}/lib3270++.so.%{MAJOR_VERSION}
  335 +
  336 +%files -n libv3270-%{_libvrs}
  337 +%defattr(-,root,root)
  338 +%{_libdir}/libv3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
  339 +%{_libdir}/libv3270.so.%{MAJOR_VERSION}
314 340
315 %files -n lib3270-devel 341 %files -n lib3270-devel
316 %defattr(-,root,root) 342 %defattr(-,root,root)
@@ -321,22 +347,29 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml @@ -321,22 +347,29 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
321 %{_libdir}/lib3270.a 347 %{_libdir}/lib3270.a
322 %{_datadir}/pw3270/locale 348 %{_datadir}/pw3270/locale
323 349
  350 +%{_libdir}/lib3270++.a
  351 +%{_libdir}/lib3270++.so
  352 +%{_includedir}/lib3270++.h
  353 +%{_libdir}/pkgconfig/lib3270++.pc
  354 +
324 %files devel 355 %files devel
325 %defattr(-,root,root) 356 %defattr(-,root,root)
326 357
327 -%{_includedir}/pw3270  
328 %{_includedir}/pw3270.h 358 %{_includedir}/pw3270.h
329 -  
330 -%{_includedir}/v3270  
331 %{_includedir}/v3270.h 359 %{_includedir}/v3270.h
332 360
333 -%{_datadir}/pw3270/ui/98trace.xml  
334 -%{_datadir}/pw3270/ui/99debug.xml 361 +%{_includedir}/pw3270
  362 +%{_includedir}/libv3270
  363 +
  364 +%{_libdir}/libv3270.a
  365 +%{_libdir}/libv3270.so
335 %{_libdir}/libpw3270.so 366 %{_libdir}/libpw3270.so
  367 +
336 %{_libdir}/pkgconfig/pw3270.pc 368 %{_libdir}/pkgconfig/pw3270.pc
  369 +%{_libdir}/pkgconfig/libv3270.pc
337 370
338 -#%{_libdir}/libpw3270cpp.a  
339 -#%{_includedir}/pw3270cpp.h 371 +%{_datadir}/pw3270/ui/98trace.xml
  372 +%{_datadir}/pw3270/ui/99debug.xml
340 373
341 %if 0%{?_dbus} 374 %if 0%{?_dbus}
342 %files plugin-dbus 375 %files plugin-dbus
@@ -348,8 +381,10 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml @@ -348,8 +381,10 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
348 381
349 %post -n lib3270-%{_libvrs} -p /sbin/ldconfig 382 %post -n lib3270-%{_libvrs} -p /sbin/ldconfig
350 %postun -n lib3270-%{_libvrs} -p /sbin/ldconfig 383 %postun -n lib3270-%{_libvrs} -p /sbin/ldconfig
351 -%post -n libpw3270-%{_libvrs} -p /sbin/ldconfig  
352 -%postun -n libpw3270-%{_libvrs} -p /sbin/ldconfig 384 +%post -n libv3270-%{_libvrs} -p /sbin/ldconfig
  385 +%postun -n libv3270-%{_libvrs} -p /sbin/ldconfig
  386 +%post -n lib3270++%{_libvrs} -p /sbin/ldconfig
  387 +%postun -n lib3270++%{_libvrs} -p /sbin/ldconfig
353 388
354 %changelog 389 %changelog
355 390