Download as
Browse Code »

Commit 4a8a6e5e3cc180a7151f7c8d63ebbeb82eff8064

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

Updating package

Showing 2 changed files with 38 additions and 147 deletions   Show diff stats
@@ -3,25 +3,25 @@ @@ -3,25 +3,25 @@
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="sslverify">disable</param> 5 <param name="sslverify">disable</param>
6 - <!-- param name="versionformat">%ct</param -->  
7 - <param name="version">5.1</param> 6 + <param name="changesgenerate">enable</param>
  7 + <param name="versionformat">%ct</param>
8 <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/principal.git</param> 8 <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/principal.git</param>
9 <param name="scm">git</param> 9 <param name="scm">git</param>
10 <param name="filename">pw3270</param> 10 <param name="filename">pw3270</param>
11 </service> 11 </service>
12 12
13 <!-- https://github.com/openSUSE/obs-service-extract_file --> 13 <!-- https://github.com/openSUSE/obs-service-extract_file -->
14 - <service name="extract_file"> 14 + <!-- service name="extract_file">
15 <param name="archive">*.tar</param> 15 <param name="archive">*.tar</param>
16 <param name="files">*/rpm/pw3270.spec</param> 16 <param name="files">*/rpm/pw3270.spec</param>
17 - <param name="outfilename">pw3270-unstable.spec</param>  
18 - </service> 17 + <param name="outfilename">pw3270.spec</param>
  18 + </service -->
19 19
20 - <service name="extract_file"> 20 + <!-- service name="extract_file">
21 <param name="archive">*.tar</param> 21 <param name="archive">*.tar</param>
22 <param name="files">*/debian/pw3270.dsc</param> 22 <param name="files">*/debian/pw3270.dsc</param>
23 - <param name="outfilename">pw3270-unstable.dsc</param>  
24 - </service> 23 + <param name="outfilename">pw3270.dsc</param>
  24 + </service -->
25 25
26 <service name="extract_file"> 26 <service name="extract_file">
27 <param name="archive">*.tar</param> 27 <param name="archive">*.tar</param>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 55
56 <service name="recompress"> 56 <service name="recompress">
57 <param name="file">*.tar</param> 57 <param name="file">*.tar</param>
58 - <param name="compression">bz2</param> 58 + <param name="compression">xz</param>
59 </service> 59 </service>
60 60
61 <service name="set_version" /> 61 <service name="set_version" />
rpm/pw3270.spec
  Diff comments   View file @4a8a6e5
@@ -43,6 +43,7 @@ Source: pw3270-%{version}.tar.bz2 @@ -43,6 +43,7 @@ Source: pw3270-%{version}.tar.bz2
43 BuildRoot: %{_tmppath}/%{name}-%{version}-build 43 BuildRoot: %{_tmppath}/%{name}-%{version}-build
44 44
45 Requires: shared-mime-info 45 Requires: shared-mime-info
  46 +Requires: %{name}-branding >= 5.2
46 47
47 #--[ Setup by distribution ]------------------------------------------------------------------------------------------ 48 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
48 # 49 #
@@ -66,6 +67,8 @@ BuildRequires: dbus-glib-devel @@ -66,6 +67,8 @@ BuildRequires: dbus-glib-devel
66 BuildRequires: openssl-devel 67 BuildRequires: openssl-devel
67 BuildRequires: gtk3-devel 68 BuildRequires: gtk3-devel
68 BuildRequires: librsvg2-tools 69 BuildRequires: librsvg2-tools
  70 +BuildRequires: lib3270-5_2-devel
  71 +BuildRequires: libv3270-5_2-devel
69 72
70 %endif 73 %endif
71 74
@@ -81,6 +84,8 @@ BuildRequires: dbus-glib-devel @@ -81,6 +84,8 @@ BuildRequires: dbus-glib-devel
81 BuildRequires: openssl-devel 84 BuildRequires: openssl-devel
82 BuildRequires: gtk3-devel 85 BuildRequires: gtk3-devel
83 BuildRequires: librsvg2-tools 86 BuildRequires: librsvg2-tools
  87 +BuildRequires: lib3270-5_2-devel
  88 +BuildRequires: libv3270-5_2-devel
84 89
85 # Genmarshal do CENTOS não tem dependência do python! 90 # Genmarshal do CENTOS não tem dependência do python!
86 BuildRequires: python 91 BuildRequires: python
@@ -97,6 +102,8 @@ BuildRequires: pkgconfig(dbus-1) @@ -97,6 +102,8 @@ BuildRequires: pkgconfig(dbus-1)
97 BuildRequires: pkgconfig(dbus-glib-1) 102 BuildRequires: pkgconfig(dbus-glib-1)
98 BuildRequires: pkgconfig(openssl) 103 BuildRequires: pkgconfig(openssl)
99 BuildRequires: pkgconfig(gtk+-3.0) 104 BuildRequires: pkgconfig(gtk+-3.0)
  105 +BuildRequires: pkgconfig(lib3270)
  106 +BuildRequires: pkgconfig(libv3270)
100 BuildRequires: librsvg2-tools 107 BuildRequires: librsvg2-tools
101 108
102 %endif 109 %endif
@@ -116,6 +123,8 @@ BuildRequires: pkgconfig(openssl) @@ -116,6 +123,8 @@ BuildRequires: pkgconfig(openssl)
116 BuildRequires: pkgconfig(dbus-1) 123 BuildRequires: pkgconfig(dbus-1)
117 BuildRequires: pkgconfig(dbus-glib-1) 124 BuildRequires: pkgconfig(dbus-glib-1)
118 BuildRequires: pkgconfig(gtk+-3.0) 125 BuildRequires: pkgconfig(gtk+-3.0)
  126 +BuildRequires: pkgconfig(lib3270)
  127 +BuildRequires: pkgconfig(libv3270)
119 BuildRequires: rsvg-view 128 BuildRequires: rsvg-view
120 129
121 %endif 130 %endif
@@ -147,81 +156,21 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used @@ -147,81 +156,21 @@ GTK-based IBM 3270 terminal emulator with many advanced features. It can be used
147 156
148 Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide. 157 Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide.
149 158
150 -#--[ lib3270 ]-------------------------------------------------------------------------------------------------------- 159 +#--[ Configuration & Branding ]---------------------------------------------------------------------------------------
151 160
152 -%package -n lib3270-%{_libvrs}  
153 -Summary: 3270 Communication library for %{name}  
154 -Group: System/Libraries  
155 -Provides: lib3270 = %{version} 161 +%package branding
  162 +Summary: Configuration and branding for %{name}
  163 +Group: System/X11/Terminals
  164 +Requires: %{name} = %{version}
156 165
157 -Provides: lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}  
158 -Conflicts: otherproviders(lib3270_%{MAJOR_VERSION}_%{MINOR_VERSION}) 166 +Provides: %{name}-config = %{version}
  167 +Conflicts: otherproviders(%{name}-config)
159 168
160 -%description -n lib3270-%{_libvrs}  
161 -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.  
162 -  
163 -This package contains the tn3270 protocol library for %{name}.  
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 -  
177 -%package -n libv3270-%{_libvrs}  
178 -Summary: 3270 Communication library for %{name}  
179 -Group: System/Libraries  
180 -Provides: lib3270 = %{version}  
181 -  
182 -Provides: lib3270_%{_libvrs}  
183 -Conflicts: otherproviders(lib3270_%{_libvrs})  
184 -  
185 -%description -n libv3270-%{_libvrs}  
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.  
187 -  
188 -This package contains the tn3270 protocol library for %{name}.  
189 -  
190 -#--[ Devel ]----------------------------------------------------------------------------------------------------------  
191 -  
192 -%package -n lib3270-devel  
193 -Summary: Devel for 3270 Communication library for %{name}  
194 -Group: Development/Libraries/C and C++  
195 -Requires: lib3270-%{_libvrs} = %{version}  
196 -Requires: lib3270++%{_libvrs} = %{version}  
197 -  
198 -Provides: lib3270-%{_libvrs}-devel  
199 -Conflicts: otherproviders(lib3270-%{_libvrs}-devel)  
200 169
201 -Provides: lib3270++%{_libvrs}-devel  
202 -Conflicts: otherproviders(lib3270++%{_libvrs}-devel)  
203 -  
204 -%description -n lib3270-devel  
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.  
206 -  
207 -This package contains the development files for tn3270 protocol library for %{name}.  
208 -  
209 -%package devel  
210 -Summary: Files required for development of %{name} plugins  
211 -Group: Development/Libraries/C and C++  
212 -Requires: pkgconfig(lib3270) = %{version}  
213 -  
214 -Requires: pkgconfig(gtk+-3.0)  
215 -Requires: lib3270-devel = %{version}  
216 -  
217 -Provides: libv3270-devel = %{version}  
218 -Conflicts: otherproviders(libv3270-devel)  
219 -  
220 -  
221 -%description -n %{name}-devel 170 +%description branding
222 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. 171 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.
223 172
224 -This package contains the development files for %{name}. 173 +This package contains the default configuration and branding for %{name}.
225 174
226 #--[ Plugins ]-------------------------------------------------------------------------------------------------------- 175 #--[ Plugins ]--------------------------------------------------------------------------------------------------------
227 176
@@ -248,9 +197,6 @@ automake --add-missing 2&gt; /dev/null | true @@ -248,9 +197,6 @@ automake --add-missing 2&gt; /dev/null | true
248 aclocal 197 aclocal
249 autoconf 198 autoconf
250 199
251 -NOCONFIGURE=1 ./modules/lib3270/autogen.sh  
252 -NOCONFIGURE=1 ./modules/libv3270/autogen.sh  
253 -  
254 %configure \ 200 %configure \
255 --with-release=%{release} 201 --with-release=%{release}
256 202
@@ -304,73 +250,25 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml @@ -304,73 +250,25 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
304 # Main application 250 # Main application
305 %dir %{_datadir}/pw3270 251 %dir %{_datadir}/pw3270
306 %dir %{_datadir}/pw3270/ui 252 %dir %{_datadir}/pw3270/ui
307 -%{_bindir}/pw3270  
308 -%{_datadir}/applications/pw3270.desktop  
309 -  
310 -%{_datadir}/pw3270/ui/00default.xml  
311 -%{_datadir}/pw3270/ui/10functions.xml  
312 -%{_datadir}/pw3270/ui/10keypad.xml  
313 -%{_datadir}/pw3270/colors.conf  
314 -%{_datadir}/pw3270/pw3270.png  
315 -%{_datadir}/pw3270/pw3270-logo.png  
316 -  
317 %dir %{_datadir}/pw3270/charsets 253 %dir %{_datadir}/pw3270/charsets
318 -%{_datadir}/pw3270/charsets/bracket.xml  
319 -  
320 %dir %{_libdir}/pw3270-plugins 254 %dir %{_libdir}/pw3270-plugins
321 255
322 -%defattr(-,root,root) 256 +%{_bindir}/pw3270
  257 +%{_datadir}/pw3270/charsets/bracket.xml
  258 +
323 %{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION} 259 %{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
324 %{_libdir}/libpw3270.so.%{MAJOR_VERSION} 260 %{_libdir}/libpw3270.so.%{MAJOR_VERSION}
325 261
326 -%files -n lib3270-%{_libvrs}  
327 -%defattr(-,root,root)  
328 -%{_libdir}/lib3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}  
329 -%{_libdir}/lib3270.so.%{MAJOR_VERSION}  
330 -  
331 -%files -n lib3270++%{_libvrs}  
332 -%defattr(-,root,root)  
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}  
340 -  
341 -%files -n lib3270-devel  
342 -%defattr(-,root,root)  
343 -%{_includedir}/lib3270  
344 -%{_includedir}/lib3270.h  
345 -%{_libdir}/pkgconfig/lib3270.pc  
346 -%{_libdir}/lib3270.so  
347 -%{_libdir}/lib3270.a  
348 -  
349 -%{_libdir}/lib3270++.a  
350 -%{_libdir}/lib3270++.so  
351 -%{_includedir}/lib3270++.h  
352 -%{_libdir}/pkgconfig/lib3270++.pc  
353 -  
354 -%files devel 262 +%files branding
355 %defattr(-,root,root) 263 %defattr(-,root,root)
356 264
357 -%{_datadir}/pw3270/locale  
358 -  
359 -%{_includedir}/pw3270.h  
360 -%{_includedir}/v3270.h  
361 -  
362 -%{_includedir}/pw3270  
363 -%{_includedir}/v3270  
364 -  
365 -%{_libdir}/libv3270.a  
366 -%{_libdir}/libv3270.so  
367 -%{_libdir}/libpw3270.so  
368 -  
369 -%{_libdir}/pkgconfig/pw3270.pc  
370 -%{_libdir}/pkgconfig/v3270.pc  
371 -  
372 -%{_datadir}/pw3270/ui/98trace.xml  
373 -%{_datadir}/pw3270/ui/99debug.xml 265 +%{_datadir}/applications/pw3270.desktop
  266 +%{_datadir}/pw3270/ui/00default.xml
  267 +%{_datadir}/pw3270/ui/10functions.xml
  268 +%{_datadir}/pw3270/ui/10keypad.xml
  269 +%{_datadir}/pw3270/colors.conf
  270 +%{_datadir}/pw3270/pw3270.png
  271 +%{_datadir}/pw3270/pw3270-logo.png
374 272
375 %if 0%{?_dbus} 273 %if 0%{?_dbus}
376 %files plugin-dbus 274 %files plugin-dbus
@@ -380,12 +278,5 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml @@ -380,12 +278,5 @@ rm %{buildroot}/%{_datadir}/pw3270/ui/*rexx*.xml
380 278
381 #---[ Scripts ]------------------------------------------------------------------------------------------------------- 279 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
382 280
383 -%post -n lib3270-%{_libvrs} -p /sbin/ldconfig  
384 -%postun -n lib3270-%{_libvrs} -p /sbin/ldconfig  
385 -%post -n libv3270-%{_libvrs} -p /sbin/ldconfig  
386 -%postun -n libv3270-%{_libvrs} -p /sbin/ldconfig  
387 -%post -n lib3270++%{_libvrs} -p /sbin/ldconfig  
388 -%postun -n lib3270++%{_libvrs} -p /sbin/ldconfig  
389 -  
390 %changelog 281 %changelog
391 282