Download as
Browse Code »

Commit 993bf1d8a4a1c9263638b37ffa3b05a3d305af9a

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

Updating package.

Showing 5 changed files with 36 additions and 62 deletions   Show diff stats
@@ -8,11 +8,12 @@ pkgdesc="IBM 3270 Terminal emulator for GTK" @@ -8,11 +8,12 @@ pkgdesc="IBM 3270 Terminal emulator for GTK"
8 url="https://portal.softwarepublico.gov.br/social/pw3270/" 8 url="https://portal.softwarepublico.gov.br/social/pw3270/"
9 arch=(i686 x86_64) 9 arch=(i686 x86_64)
10 license=(GPL) 10 license=(GPL)
11 -depends=() 11 +depends=(libv3270)
  12 +optdepends=('pw3270-plugin-ipc: D-Bus remote control' 'pw3270-keypads: Aditional screen keypads')
12 makedepends=(autoconf automake make openssl lib3270 gtk3 libv3270 python3 dbus dbus-glib imagemagick optipng gzip) 13 makedepends=(autoconf automake make openssl lib3270 gtk3 libv3270 python3 dbus dbus-glib imagemagick optipng gzip)
13 checkdepends=() 14 checkdepends=()
14 15
15 -#groups=(gnome) 16 +groups=(gnome)
16 17
17 source=($pkgname-$pkgver.tar.xz) 18 source=($pkgname-$pkgver.tar.xz)
18 sha256sums=('SKIP') 19 sha256sums=('SKIP')
locale/pw3270.pot
  Diff comments   View file @993bf1d
@@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2023-01-18 12:47-0300\n" 11 +"POT-Creation-Date: 2023-01-30 11:48-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
rpm/pw3270.spec
  Diff comments   View file @993bf1d
@@ -13,12 +13,16 @@ @@ -13,12 +13,16 @@
13 # license that conforms to the Open Source Definition (Version 1.9) 13 # license that conforms to the Open Source Definition (Version 1.9)
14 # published by the Open Source Initiative. 14 # published by the Open Source Initiative.
15 15
16 -# Please submit bugfixes or comments via https://bugs.opensuse.org/ 16 +# Please submit bugfixes or comments via https://github.com/PerryWerneck/pw3270/issues
17 # 17 #
18 18
19 -  
20 %define _product %(pkg-config --variable=product_name lib3270) 19 %define _product %(pkg-config --variable=product_name lib3270)
21 20
  21 +%define plugindir %(pkg-config --variable=plugin_path lib3270)
  22 +%if "%{plugindir}" == ""
  23 + %define plugindir /usr/lib64/pw3270-plugins
  24 +%endif
  25 +
22 #---[ Packaging ]----------------------------------------------------------------------------------------------------- 26 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
23 27
24 Name: pw3270 28 Name: pw3270
@@ -51,8 +55,7 @@ Recommends: libv3270-config @@ -51,8 +55,7 @@ Recommends: libv3270-config
51 55
52 BuildRequires: glib2-devel 56 BuildRequires: glib2-devel
53 BuildRequires: gtk3-devel 57 BuildRequires: gtk3-devel
54 -BuildRequires: libappstream-glib  
55 -BuildRequires: libv3270-devel >= 5.3 58 +BuildRequires: libv3270-devel >= 5.4
56 59
57 %endif 60 %endif
58 61
@@ -60,10 +63,9 @@ BuildRequires: libv3270-devel &gt;= 5.3 @@ -60,10 +63,9 @@ BuildRequires: libv3270-devel &gt;= 5.3
60 63
61 %if 0%{?fedora} 64 %if 0%{?fedora}
62 65
63 -BuildRequires: libappstream-glib  
64 BuildRequires: pkgconfig(glib-2.0) 66 BuildRequires: pkgconfig(glib-2.0)
65 BuildRequires: pkgconfig(gtk+-3.0) 67 BuildRequires: pkgconfig(gtk+-3.0)
66 -BuildRequires: pkgconfig(libv3270) >= 5.3 68 +BuildRequires: pkgconfig(libv3270) >= 5.4
67 69
68 %endif 70 %endif
69 71
@@ -75,7 +77,7 @@ BuildRequires: appstream-glib @@ -75,7 +77,7 @@ BuildRequires: appstream-glib
75 BuildRequires: update-desktop-files 77 BuildRequires: update-desktop-files
76 BuildRequires: pkgconfig(glib-2.0) 78 BuildRequires: pkgconfig(glib-2.0)
77 BuildRequires: pkgconfig(gtk+-3.0) 79 BuildRequires: pkgconfig(gtk+-3.0)
78 -BuildRequires: pkgconfig(libv3270) >= 5.3 80 +BuildRequires: pkgconfig(libv3270) >= 5.4
79 81
80 %glib2_gsettings_schema_requires 82 %glib2_gsettings_schema_requires
81 83
@@ -106,14 +108,14 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra @@ -106,14 +108,14 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra
106 108
107 #--[ Configuration & Branding ]--------------------------------------------------------------------------------------- 109 #--[ Configuration & Branding ]---------------------------------------------------------------------------------------
108 %package branding 110 %package branding
109 -Summary: Default branding for %{name}  
110 -Group: System/X11/Terminals 111 +Summary: Default branding for %{name}
  112 +Group: System/X11/Terminals
111 113
112 -Requires: %{name} = %{version}  
113 -BuildArch: noarch 114 +Requires: %{name} = %{version}
  115 +BuildArch: noarch
114 116
115 -Requires(post): desktop-file-utils  
116 -Requires(postun):desktop-file-utils 117 +Requires(post): desktop-file-utils
  118 +Requires(postun): desktop-file-utils
117 119
118 %description branding 120 %description branding
119 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. 121 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.
@@ -128,24 +130,6 @@ This package contains the default branding for %{name}. @@ -128,24 +130,6 @@ This package contains the default branding for %{name}.
128 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects 130 %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
129 NOCONFIGURE=1 ./autogen.sh 131 NOCONFIGURE=1 ./autogen.sh
130 132
131 -# Pull request #20 broke SLE-12 builds  
132 -update_for_compatibility() {  
133 - sed -i -e "s|<id>@APPLICATION_ID@|<id>@APPLICATION_ID@.desktop|" branding/metainfo.xml.in  
134 - sed -i -e "s|<component type=\"desktop-application\">|<component type=\"desktop\">|" branding/metainfo.xml.in  
135 -}  
136 -  
137 -%if 0%{?suse_version}  
138 - %if 0%{?suse_version} < 1500  
139 - update_for_compatibility  
140 - %endif  
141 -%endif  
142 -  
143 -%if 0%{?fedora}  
144 - %if 0%{?fedora_version} < 27  
145 - update_for_compatibility  
146 - %endif  
147 -%endif  
148 -  
149 %configure --with-release=%{release} CFLAGS="${CFLAGS} -fpie" LDFLAGS="${LDFLAGS} -pie" 133 %configure --with-release=%{release} CFLAGS="${CFLAGS} -fpie" LDFLAGS="${LDFLAGS} -pie"
150 134
151 %build 135 %build
@@ -159,7 +143,9 @@ make all -j1 @@ -159,7 +143,9 @@ make all -j1
159 143
160 %find_lang pw3270 langfiles 144 %find_lang pw3270 langfiles
161 145
  146 +%if 0%{?suse_version}
162 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml 147 appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
  148 +%endif
163 149
164 %fdupes %{buildroot}/%{_prefix} 150 %fdupes %{buildroot}/%{_prefix}
165 151
@@ -171,18 +157,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf @@ -171,18 +157,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf
171 # Main application 157 # Main application
172 %dir %{_datadir}/%{_product} 158 %dir %{_datadir}/%{_product}
173 %dir %{_datadir}/%{_product}/keypad 159 %dir %{_datadir}/%{_product}/keypad
174 -%dir %{_libdir}/%{_product}-plugins 160 +%dir %{plugindir}
175 %dir %{_datadir}/%{_product}/icons 161 %dir %{_datadir}/%{_product}/icons
176 162
177 %{_bindir}/%{_product} 163 %{_bindir}/%{_product}
178 164
179 # Desktop files 165 # Desktop files
180 %{_datadir}/applications/*.desktop 166 %{_datadir}/applications/*.desktop
181 -  
182 -%if 0%{?suse_version} < 1500  
183 -%dir %{_datadir}/metainfo  
184 -%endif  
185 -  
186 %{_datadir}/metainfo/*.metainfo.xml 167 %{_datadir}/metainfo/*.metainfo.xml
187 168
188 # Icons 169 # Icons
src/objects/os/windows/savedesktopicon.c
  Diff comments   View file @993bf1d
@@ -238,7 +238,7 @@ static HRESULT CreateShortCut(const char * pszTargetfile, const char * pszTarget @@ -238,7 +238,7 @@ static HRESULT CreateShortCut(const char * pszTargetfile, const char * pszTarget
238 238
239 HRESULT hRes = 239 HRESULT hRes =
240 CoCreateInstance( 240 CoCreateInstance(
241 - &CLSID_ShellLink, // predefined CLSID of the IShellLink object 241 + CLSID_ShellLink, // predefined CLSID of the IShellLink object
242 NULL, // pointer to parent interface if part of aggregate 242 NULL, // pointer to parent interface if part of aggregate
243 CLSCTX_INPROC_SERVER, // caller and called code are in same process 243 CLSCTX_INPROC_SERVER, // caller and called code are in same process
244 &IID_IShellLink, // predefined interface of the IShellLink object 244 &IID_IShellLink, // predefined interface of the IShellLink object
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270  
4 -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a  
5 -# aplicativos mainframe. Registro no INPI sob o nome G3270. 3 +# SPDX-License-Identifier: LGPL-3.0-or-later
6 # 4 #
7 # Copyright (C) <2008> <Banco do Brasil S.A.> 5 # Copyright (C) <2008> <Banco do Brasil S.A.>
8 # 6 #
9 -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob  
10 -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela  
11 -# Free Software Foundation. 7 +# This program is free software: you can redistribute it and/or modify
  8 +# it under the terms of the GNU Lesser General Public License as published
  9 +# by the Free Software Foundation, either version 3 of the License, or
  10 +# (at your option) any later version.
12 # 11 #
13 -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER  
14 -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO  
15 -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para  
16 -# obter mais detalhes.  
17 -#  
18 -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este  
19 -# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin  
20 -# St, Fifth Floor, Boston, MA 02110-1301 USA  
21 -#  
22 -# Contatos:  
23 -#  
24 -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)  
25 -# erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) 12 +# This program is distributed in the hope that it will be useful,
  13 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
  14 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  15 +# GNU General Public License for more details.
26 # 16 #
  17 +# You should have received a copy of the GNU Lesser General Public License
  18 +# along with this program. If not, see <https://www.gnu.org/licenses/>.
27 # 19 #
28 20
29 PRODUCT_NAME="pw3270" 21 PRODUCT_NAME="pw3270"
30 LIBRARY_NAME="lib3270" 22 LIBRARY_NAME="lib3270"
31 CORE_LIBRARIES="lib3270 libv3270 libipc3270" 23 CORE_LIBRARIES="lib3270 libv3270 libipc3270"
32 -PACKAGE_PLUGINS="" 24 +PACKAGE_PLUGINS="ipc"
33 PACKAGE_EXTRAS="libhllapi pw3270-keypads" 25 PACKAGE_EXTRAS="libhllapi pw3270-keypads"
34 26
35 #TARGET_ARCHS="x86_64 x86_32" 27 #TARGET_ARCHS="x86_64 x86_32"
@@ -271,7 +263,7 @@ buildLibrary() @@ -271,7 +263,7 @@ buildLibrary()
271 } 263 }
272 264
273 # 265 #
274 -# Build language binding 266 +# Build extra package
275 # 267 #
276 buildExtraPackage() 268 buildExtraPackage()
277 { 269 {