Download as
Browse Code »

Commit 32a6fd1abbead9bc233e063078eaab874c3b6b3f

Authored by Perry Werneck
1 parent b199c0de
Exists in master and in 3 other branches develop, edit-header-bar, script-support

Updating package control files.

Showing 5 changed files with 101 additions and 179 deletions   Show diff stats
debian/changelog
  Diff comments   View file @32a6fd1
1   -pw3270 (5.2-0) unstable; urgency=low
  1 +pw3270 (5.3-0) unstable; urgency=low
2 2  
3 3 * Initial Release
4 4  
... ...
debian/control
  Diff comments   View file @32a6fd1
... ... @@ -2,25 +2,24 @@ Source: pw3270
2 2 Section: unknown
3 3 Priority: optional
4 4 Maintainer: Perry Werneck <perry.werneck@gmail.com>
5   -Build-Depends: debhelper (>= 7), autotools-dev, autoconf, libgtk-3-dev, gettext, libssl-dev, desktop-file-utils, libdbus-glib-1-dev, libssl-dev, imagemagick, librsvg2-bin, libv3270-dev
  5 +Build-Depends: debhelper (>= 7), autotools-dev, autoconf, libgtk-3-dev, gettext, desktop-file-utils, imagemagick, librsvg2-bin, libv3270-dev
6 6  
7 7 Package: pw3270
8 8 Architecture: any
9   -Depends: ${shlibs:Depends}
  9 +Depends: ${misc:Depends}, ${shlibs:Depends}
10 10 Description: IBM 3270 Terminal emulator for gtk
11 11 IBM 3270 terminal emulator gtk. It can be used to communicate with
12 12 any IBM host that supports 3270-style connections over TELNET.
13 13  
14   -Package: pw3270-dev
  14 +Package: pw3270-keypads
15 15 Architecture: any
16   -Section: libdevel
17   -Depends: ${misc:Depends}, libdbus-1-dev, libv3270-dev, pw3270 (= ${binary:Version})
18   -Description: lib3270 development files.
19   - This package contains the files needed for development of pw3270 extensions and plugins
  16 +Depends: pw3270 (= ${binary:Version})
  17 +Description: Keypads for pw3270
  18 + This package provides optional keypads for pw3270 application.
20 19  
21 20 Package: pw3270-dbg
22 21 Architecture: any
23   -Depends: pw3270 (= ${binary:Version}), ${misc:Depends}
  22 +Depends: pw3270 (= ${binary:Version})
24 23 Description: Debugging symbols for pw3270/lib3270
25 24 This package contains the debugging symbols for pw3270's internal libs.
26 25  
... ...
debian/rules
  Diff comments   View file @32a6fd1
... ... @@ -37,7 +37,7 @@ build-stamp:
37 37 ./configure --prefix=/usr
38 38  
39 39 rm -f debian/*.install
40   - make all
  40 + make Release
41 41  
42 42 # --- end custom part for compiling
43 43  
... ... @@ -69,6 +69,8 @@ install: build
69 69 # Install option keypads
70 70 make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-keypads install-keypads
71 71  
  72 + # --- end custom part for installing
  73 +
72 74 # Build architecture-independent files here.
73 75 binary-indep: build install
74 76 # We have nothing to do by default.
... ... @@ -92,7 +94,7 @@ binary-arch: build install
92 94 # dh_undocumented
93 95 dh_installchangelogs
94 96 dh_link
95   - dh_strip --dbg-package=pw3270-unstable-dbg
  97 + dh_strip --dbg-package=pw3270-dbg
96 98 dh_compress
97 99 dh_fixperms
98 100 dh_makeshlibs
... ...
rpm/_service
  Diff comments   View file @32a6fd1
... ... @@ -3,22 +3,17 @@
3 3 <!-- https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.py -->
4 4 <service name="tar_scm">
5 5  
6   - <!--
7   - <param name="sslverify">disable</param>
8   - <param name="url">http://softwarepublico.gov.br/gitlab/pw3270/principal.git</param>
9   - <param name="filename">pw3270</param>
10   - -->
11   -
12 6 <param name="url">https://github.com/PerryWerneck/pw3270.git</param>
13 7  
14   - <param name="changesgenerate">enable</param>
15   - <param name="changesauthor">perry.werneck@gmail.com</param>
  8 + <param name="changesgenerate">enable</param>
  9 + <param name="changesauthor">perry.werneck@gmail.com</param>
16 10  
17 11 <param name="versionformat">@PARENT_TAG@</param>
18 12 <param name="scm">git</param>
19 13 </service>
20 14  
21 15 <!-- https://github.com/openSUSE/obs-service-extract_file -->
  16 + <!--
22 17 <service name="extract_file">
23 18 <param name="archive">*.tar</param>
24 19 <param name="files">*/rpm/pw3270.spec</param>
... ... @@ -64,7 +59,8 @@
64 59 <param name="files">*/arch/PKGBUILD</param>
65 60 <param name="outfilename">PKGBUILD</param>
66 61 </service>
67   -
  62 + -->
  63 +
68 64 <service name="recompress">
69 65 <param name="file">*.tar</param>
70 66 <param name="compression">xz</param>
... ...
rpm/pw3270.spec
  Diff comments   View file @32a6fd1
1 1 #
2 2 # spec file for package pw3270
3 3 #
4   -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
5   -# Copyright (C) <2008> <Banco do Brasil S.A.>
  4 +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
  5 +# Copyright (c) <2008> <Banco do Brasil S.A.>
6 6 #
7 7 # All modifications and additions to the file contributed by third parties
8 8 # remain the property of their copyright owners, unless otherwise agreed
... ... @@ -13,37 +13,29 @@
13 13 # license that conforms to the Open Source Definition (Version 1.9)
14 14 # published by the Open Source Initiative.
15 15  
16   -# Please submit bugfixes or comments via http://bugs.opensuse.org/
  16 +# Please submit bugfixes or comments via https://bugs.opensuse.org/
17 17 #
18 18  
19 19 #---[ Versions ]------------------------------------------------------------------------------------------------------
20 20  
21   -%define MAJOR_VERSION 5
22   -%define MINOR_VERSION 2
23   -
24   -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION}
25   -
26   -#---[ Selected modules ]----------------------------------------------------------------------------------------------
27   -
28   -%define _dbus 1
29   -%define _help2man 1
  21 +%define _product %(pkg-config --variable=product_name lib3270)
30 22  
31 23 #---[ Packaging ]-----------------------------------------------------------------------------------------------------
32 24  
33   -Name: pw3270
34   -Version: 5.2
35   -Release: 0
36   -Summary: IBM 3270 Terminal emulator for GTK
37   -License: GPL-2.0
38   -Group: System/X11/Terminals
39   -Url: https://portal.softwarepublico.gov.br/social/pw3270/
  25 +Name: pw3270
  26 +Version: 5.3
  27 +Release: 0
  28 +Summary: IBM 3270 Terminal emulator for GTK
  29 +License: GPL-2.0
  30 +Group: System/X11/Terminals
  31 +Url: https://portal.softwarepublico.gov.br/social/pw3270/
40 32  
41   -Source: pw3270-%{version}.tar.xz
  33 +Source: pw3270-%{version}.tar.xz
42 34  
43   -BuildRoot: %{_tmppath}/%{name}-%{version}-build
  35 +BuildRoot: %{_tmppath}/%{name}-%{version}-build
44 36  
45   -Requires: shared-mime-info
46   -Requires: %{name}-branding >= 5.2
  37 +Requires: shared-mime-info
  38 +Requires: %{name}-branding = %{version}
47 39  
48 40 #--[ Setup by distribution ]------------------------------------------------------------------------------------------
49 41 #
... ... @@ -56,15 +48,10 @@ Requires: %{name}-branding &gt;= 5.2
56 48  
57 49 %if 0%{?rhel_version}
58 50  
59   -%define _help2man 0
60   -
61   -BuildRequires: dbus-devel
62   -BuildRequires: dbus-glib-devel
63   -BuildRequires: openssl-devel
64   -BuildRequires: gtk3-devel
65   -BuildRequires: librsvg2-tools
66   -BuildRequires: lib3270-devel
67   -BuildRequires: libv3270-devel
  51 +BuildRequires: gtk3-devel
  52 +BuildRequires: glib2-devel
  53 +BuildRequires: librsvg2-tools
  54 +BuildRequires: libv3270-devel >= %{version}
68 55  
69 56 %endif
70 57  
... ... @@ -72,18 +59,12 @@ BuildRequires: libv3270-devel
72 59  
73 60 %if 0%{?centos_version}
74 61  
75   -%define _help2man 0
  62 +BuildRequires: gtk3-devel
  63 +BuildRequires: glib2-devel
  64 +BuildRequires: libv3270-devel
76 65  
77   -BuildRequires: dbus-devel
78   -BuildRequires: dbus-glib-devel
79   -BuildRequires: openssl-devel
80   -BuildRequires: gtk3-devel
81   -BuildRequires: librsvg2-tools
82   -BuildRequires: lib3270-devel
83   -BuildRequires: libv3270-devel
84   -
85   -# CENTOS Genmarshal doesn't depends on python!
86   -BuildRequires: python
  66 +# Required for genmarshal
  67 +BuildRequires: python
87 68  
88 69 %endif
89 70  
... ... @@ -91,14 +72,9 @@ BuildRequires: python
91 72  
92 73 %if 0%{?fedora}
93 74  
94   -BuildRequires: pkgconfig(dbus-1)
95   -BuildRequires: pkgconfig(dbus-glib-1)
96   -BuildRequires: pkgconfig(openssl)
97   -BuildRequires: pkgconfig(gtk+-3.0)
98   -BuildRequires: pkgconfig(lib3270)
99   -BuildRequires: pkgconfig(libv3270)
100   -BuildRequires: librsvg2-tools
101   -BuildRequires: autoconf-archive
  75 +BuildRequires: pkgconfig(gtk+-3.0)
  76 +BuildRequires: pkgconfig(glib-2.0)
  77 +BuildRequires: pkgconfig(libv3270) >= %{version}
102 78  
103 79 %endif
104 80  
... ... @@ -106,105 +82,76 @@ BuildRequires: autoconf-archive
106 82  
107 83 %if 0%{?suse_version}
108 84  
109   -BuildRequires: pkgconfig(openssl)
110   -BuildRequires: pkgconfig(dbus-1)
111   -BuildRequires: pkgconfig(dbus-glib-1)
112   -BuildRequires: pkgconfig(gtk+-3.0)
113   -BuildRequires: pkgconfig(lib3270)
114   -BuildRequires: pkgconfig(libv3270)
115   -BuildRequires: rsvg-view
116   -
117   -# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto
118   -%if 0%{suse_version} > 120100
119   -BuildRequires: autoconf-archive
120   -BuildRequires: update-desktop-files
121   -%endif
  85 +BuildRequires: pkgconfig(gtk+-3.0)
  86 +BuildRequires: pkgconfig(glib-2.0)
  87 +BuildRequires: pkgconfig(libv3270) >= %{version}
122 88  
123 89 %endif
124 90  
125 91 #---------------------------------------------------------------------------------------------------------------------
126 92  
127   -BuildRequires: autoconf >= 2.61
128   -BuildRequires: automake
129   -BuildRequires: binutils
130   -BuildRequires: coreutils
131   -BuildRequires: desktop-file-utils
132   -BuildRequires: findutils
133   -BuildRequires: gcc-c++
134   -BuildRequires: gettext-devel
135   -BuildRequires: m4
136   -BuildRequires: pkgconfig
137   -BuildRequires: sed
138   -BuildRequires: optipng
139   -BuildRequires: fdupes
140   -BuildRequires: ImageMagick
141   -
142   -%if 0%{?_help2man}
143   -BuildRequires: help2man
144   -%endif
  93 +BuildRequires: autoconf >= 2.61
  94 +BuildRequires: automake
  95 +BuildRequires: binutils
  96 +BuildRequires: coreutils
  97 +BuildRequires: desktop-file-utils
  98 +BuildRequires: findutils
  99 +BuildRequires: gcc-c++
  100 +BuildRequires: gettext-devel
  101 +BuildRequires: gettext-tools
  102 +BuildRequires: m4
  103 +BuildRequires: pkgconfig
  104 +BuildRequires: sed
  105 +BuildRequires: optipng
  106 +BuildRequires: fdupes
  107 +BuildRequires: ImageMagick
  108 +BuildRequires: autoconf-archive
  109 +%glib2_gsettings_schema_requires
145 110  
146 111 %description
147 112 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.
148 113  
149 114 Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide.
150 115  
151   -#--[ Application library ]--------------------------------------------------------------------------------------------
152   -
153   -%package -n libpw3270-%{_libvrs}
154   -Summary: PW3270 API for plugins
155   -Group: System/Libraries
156   -
157   -%description -n libpw3270-%{_libvrs}
158   -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.
159   -
160   -This package contains the plugin support library.
161   -
162 116 #--[ Configuration & Branding ]---------------------------------------------------------------------------------------
163 117  
164 118 %package branding
165   -Summary: Configuration and branding for %{name}
166   -Group: System/X11/Terminals
167   -Requires: %{name} = %{version}
168   -
169   -Provides: %{name}-config = %{version}
170   -Conflicts: otherproviders(%{name}-config)
171   -
  119 +Summary: Default branding for %{name}
  120 +Group: System/X11/Terminals
  121 +Requires: %{name} = %{version}
172 122  
173 123 %description branding
174 124 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.
175 125  
176   -This package contains the default configuration and branding for %{name}.
177   -
178   -#--[ Devel ]----------------------------------------------------------------------------------------------------------
  126 +This package contains the default branding for %{name}.
179 127  
180   -%package devel
181   -Summary: Files required for development of %{name} plugins
182   -Group: Development/Libraries/C and C++
183   -
184   -Requires: pkgconfig(lib3270)
185   -Requires: pkgconfig(libv3270)
186   -Requires: pkgconfig(gtk+-3.0)
  128 +%package keypads
  129 +Summary: Keypads for %{name}
  130 +Group: System/X11/Terminals
187 131 Requires: %{name} = %{version}
188   -Requires: libpw3270-%{_libvrs}
  132 +BuildArch: noarch
189 133  
190   -%description -n %{name}-devel
  134 +Provides: pw3270-keypads = %{version}
  135 +Conflicts: otherproviders(pw3270-keypads)
  136 +Enhances: %{name}
  137 +
  138 +%description keypads
191 139 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.
192 140  
193   -This package contains the development files for %{name}.
  141 +This package contains the keypads for %{name}.
194 142  
195 143 #---[ Build & Install ]-----------------------------------------------------------------------------------------------
196 144  
197 145 %prep
  146 +%setup
198 147  
199   -%setup -q -n pw3270-%{version}
200   -
  148 +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
201 149 NOCONFIGURE=1 ./autogen.sh
202 150  
203   -%configure \
204   - --with-release=%{release}
  151 +%configure --with-release=%{release} CFLAGS="${CFLAGS} -fpie" LDFLAGS="${LDFLAGS} -pie"
205 152  
206 153 %build
207   -make clean
  154 +make %{?_smp_mflags} clean
208 155  
209 156 # parallel build is broken
210 157 make all -j1
... ... @@ -212,9 +159,6 @@ make all -j1
212 159 %install
213 160 %make_install
214 161  
215   -# Remove static library
216   -rm -f %{buildroot}/%{_libdir}/*.a
217   -
218 162 %find_lang pw3270 langfiles
219 163  
220 164 %fdupes %{buildroot}/%{_prefix}
... ... @@ -222,53 +166,34 @@ rm -f %{buildroot}/%{_libdir}/*.a
222 166 #---[ Files ]---------------------------------------------------------------------------------------------------------
223 167  
224 168 %files -f langfiles
225   -%defattr(-,root,root)
226   -%doc AUTHORS LICENSE README.md
227   -%if 0%{?_help2man}
228   -%{_mandir}/*/*
229   -%endif
  169 +%license LICENSE
  170 +%doc AUTHORS README.md
230 171  
231 172 # Main application
232   -%dir %{_datadir}/pw3270
233   -%dir %{_datadir}/pw3270/ui
234   -%dir %{_libdir}/pw3270-plugins
  173 +%dir %{_datadir}/%{_product}
  174 +%dir %{_datadir}/%{_product}/ui
  175 +%dir %{_datadir}/%{_product}/keypad
  176 +%dir %{_libdir}/%{_product}-plugins
235 177  
236   -%{_bindir}/pw3270
  178 +%{_bindir}/%{_product}
  179 +%{_datadir}/applications/*.desktop
  180 +%{_datadir}/pixmaps/*.png
237 181  
238   -%files -n libpw3270-%{_libvrs}
239   -%defattr(-,root,root)
240   -%{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION}
241   -%{_libdir}/libpw3270.so.%{MAJOR_VERSION}
  182 +%{_datadir}/glib-2.0/schemas/*.xml
242 183  
243 184 %files branding
244   -%defattr(-,root,root)
  185 +%{_datadir}/%{_product}/ui/*
  186 +%{_datadir}/%{_product}/*.png
245 187  
246   -%{_datadir}/applications/pw3270.desktop
247   -%{_datadir}/pw3270/ui/00default.xml
248   -%{_datadir}/pw3270/ui/10functions.xml
249   -%{_datadir}/pw3270/ui/10keypad.xml
250   -%{_datadir}/pw3270/pw3270.png
251   -%{_datadir}/pw3270/pw3270-logo.png
252   -%{_datadir}/pixmaps/pw3270.png
253   -
254   -%files devel
255   -
256   -%{_includedir}/pw3270.h
257   -%{_includedir}/pw3270cpp.h
258   -%{_includedir}/pw3270
259   -
260   -%{_libdir}/libpw3270.so
261   -
262   -%{_libdir}/pkgconfig/pw3270.pc
263   -%{_datadir}/pw3270/locale
264   -
265   -%{_datadir}/pw3270/ui/98trace.xml
266   -%{_datadir}/pw3270/ui/99debug.xml
  188 +%files keypads
  189 +%{_datadir}/%{_product}/keypad/*
267 190  
268 191 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
269 192  
270   -%post -n libpw3270-%{_libvrs} -p /sbin/ldconfig
271   -%postun -n libpw3270-%{_libvrs} -p /sbin/ldconfig
  193 +%post
  194 +%glib2_gsettings_schema_post
272 195  
273   -%changelog
  196 +%postun
  197 +%glib2_gsettings_schema_postun
274 198  
  199 +%changelog
... ...