From 32a6fd1abbead9bc233e063078eaab874c3b6b3f Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 8 Jun 2020 19:16:31 -0300 Subject: [PATCH] Updating package control files. --- debian/changelog | 2 +- debian/control | 15 +++++++-------- debian/rules | 6 ++++-- rpm/_service | 14 +++++--------- rpm/pw3270.spec | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------- 5 files changed, 101 insertions(+), 179 deletions(-) diff --git a/debian/changelog b/debian/changelog index 83ada8e..0cdd5d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pw3270 (5.2-0) unstable; urgency=low +pw3270 (5.3-0) unstable; urgency=low * Initial Release diff --git a/debian/control b/debian/control index 8b77400..0159630 100644 --- a/debian/control +++ b/debian/control @@ -2,25 +2,24 @@ Source: pw3270 Section: unknown Priority: optional Maintainer: Perry Werneck -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 +Build-Depends: debhelper (>= 7), autotools-dev, autoconf, libgtk-3-dev, gettext, desktop-file-utils, imagemagick, librsvg2-bin, libv3270-dev Package: pw3270 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Description: IBM 3270 Terminal emulator for gtk IBM 3270 terminal emulator gtk. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. -Package: pw3270-dev +Package: pw3270-keypads Architecture: any -Section: libdevel -Depends: ${misc:Depends}, libdbus-1-dev, libv3270-dev, pw3270 (= ${binary:Version}) -Description: lib3270 development files. - This package contains the files needed for development of pw3270 extensions and plugins +Depends: pw3270 (= ${binary:Version}) +Description: Keypads for pw3270 + This package provides optional keypads for pw3270 application. Package: pw3270-dbg Architecture: any -Depends: pw3270 (= ${binary:Version}), ${misc:Depends} +Depends: pw3270 (= ${binary:Version}) Description: Debugging symbols for pw3270/lib3270 This package contains the debugging symbols for pw3270's internal libs. diff --git a/debian/rules b/debian/rules index 0808da4..6be2351 100644 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ build-stamp: ./configure --prefix=/usr rm -f debian/*.install - make all + make Release # --- end custom part for compiling @@ -69,6 +69,8 @@ install: build # Install option keypads make DESTDIR=$(PWD)/debian/$(PACKAGE_NAME)-keypads install-keypads + # --- end custom part for installing + # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. @@ -92,7 +94,7 @@ binary-arch: build install # dh_undocumented dh_installchangelogs dh_link - dh_strip --dbg-package=pw3270-unstable-dbg + dh_strip --dbg-package=pw3270-dbg dh_compress dh_fixperms dh_makeshlibs diff --git a/rpm/_service b/rpm/_service index e1e4d91..0186f02 100644 --- a/rpm/_service +++ b/rpm/_service @@ -3,22 +3,17 @@ - - https://github.com/PerryWerneck/pw3270.git - enable - perry.werneck@gmail.com + enable + perry.werneck@gmail.com @PARENT_TAG@ git + + *.tar xz diff --git a/rpm/pw3270.spec b/rpm/pw3270.spec index d905cb7..58f7fad 100644 --- a/rpm/pw3270.spec +++ b/rpm/pw3270.spec @@ -1,8 +1,8 @@ # # spec file for package pw3270 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (C) <2008> +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) <2008> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -13,37 +13,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # #---[ Versions ]------------------------------------------------------------------------------------------------------ -%define MAJOR_VERSION 5 -%define MINOR_VERSION 2 - -%define _libvrs %{MAJOR_VERSION}_%{MINOR_VERSION} - -#---[ Selected modules ]---------------------------------------------------------------------------------------------- - -%define _dbus 1 -%define _help2man 1 +%define _product %(pkg-config --variable=product_name lib3270) #---[ Packaging ]----------------------------------------------------------------------------------------------------- -Name: pw3270 -Version: 5.2 -Release: 0 -Summary: IBM 3270 Terminal emulator for GTK -License: GPL-2.0 -Group: System/X11/Terminals -Url: https://portal.softwarepublico.gov.br/social/pw3270/ +Name: pw3270 +Version: 5.3 +Release: 0 +Summary: IBM 3270 Terminal emulator for GTK +License: GPL-2.0 +Group: System/X11/Terminals +Url: https://portal.softwarepublico.gov.br/social/pw3270/ -Source: pw3270-%{version}.tar.xz +Source: pw3270-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: shared-mime-info -Requires: %{name}-branding >= 5.2 +Requires: shared-mime-info +Requires: %{name}-branding = %{version} #--[ Setup by distribution ]------------------------------------------------------------------------------------------ # @@ -56,15 +48,10 @@ Requires: %{name}-branding >= 5.2 %if 0%{?rhel_version} -%define _help2man 0 - -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: openssl-devel -BuildRequires: gtk3-devel -BuildRequires: librsvg2-tools -BuildRequires: lib3270-devel -BuildRequires: libv3270-devel +BuildRequires: gtk3-devel +BuildRequires: glib2-devel +BuildRequires: librsvg2-tools +BuildRequires: libv3270-devel >= %{version} %endif @@ -72,18 +59,12 @@ BuildRequires: libv3270-devel %if 0%{?centos_version} -%define _help2man 0 +BuildRequires: gtk3-devel +BuildRequires: glib2-devel +BuildRequires: libv3270-devel -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: openssl-devel -BuildRequires: gtk3-devel -BuildRequires: librsvg2-tools -BuildRequires: lib3270-devel -BuildRequires: libv3270-devel - -# CENTOS Genmarshal doesn't depends on python! -BuildRequires: python +# Required for genmarshal +BuildRequires: python %endif @@ -91,14 +72,9 @@ BuildRequires: python %if 0%{?fedora} -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(lib3270) -BuildRequires: pkgconfig(libv3270) -BuildRequires: librsvg2-tools -BuildRequires: autoconf-archive +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libv3270) >= %{version} %endif @@ -106,105 +82,76 @@ BuildRequires: autoconf-archive %if 0%{?suse_version} -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(lib3270) -BuildRequires: pkgconfig(libv3270) -BuildRequires: rsvg-view - -# https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto -%if 0%{suse_version} > 120100 -BuildRequires: autoconf-archive -BuildRequires: update-desktop-files -%endif +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libv3270) >= %{version} %endif #--------------------------------------------------------------------------------------------------------------------- -BuildRequires: autoconf >= 2.61 -BuildRequires: automake -BuildRequires: binutils -BuildRequires: coreutils -BuildRequires: desktop-file-utils -BuildRequires: findutils -BuildRequires: gcc-c++ -BuildRequires: gettext-devel -BuildRequires: m4 -BuildRequires: pkgconfig -BuildRequires: sed -BuildRequires: optipng -BuildRequires: fdupes -BuildRequires: ImageMagick - -%if 0%{?_help2man} -BuildRequires: help2man -%endif +BuildRequires: autoconf >= 2.61 +BuildRequires: automake +BuildRequires: binutils +BuildRequires: coreutils +BuildRequires: desktop-file-utils +BuildRequires: findutils +BuildRequires: gcc-c++ +BuildRequires: gettext-devel +BuildRequires: gettext-tools +BuildRequires: m4 +BuildRequires: pkgconfig +BuildRequires: sed +BuildRequires: optipng +BuildRequires: fdupes +BuildRequires: ImageMagick +BuildRequires: autoconf-archive +%glib2_gsettings_schema_requires %description 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. Based on the original x3270 code, pw3270 was originally created for Banco do Brasil, and is now used worldwide. -#--[ Application library ]-------------------------------------------------------------------------------------------- - -%package -n libpw3270-%{_libvrs} -Summary: PW3270 API for plugins -Group: System/Libraries - -%description -n libpw3270-%{_libvrs} -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. - -This package contains the plugin support library. - #--[ Configuration & Branding ]--------------------------------------------------------------------------------------- %package branding -Summary: Configuration and branding for %{name} -Group: System/X11/Terminals -Requires: %{name} = %{version} - -Provides: %{name}-config = %{version} -Conflicts: otherproviders(%{name}-config) - +Summary: Default branding for %{name} +Group: System/X11/Terminals +Requires: %{name} = %{version} %description branding 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. -This package contains the default configuration and branding for %{name}. - -#--[ Devel ]---------------------------------------------------------------------------------------------------------- +This package contains the default branding for %{name}. -%package devel -Summary: Files required for development of %{name} plugins -Group: Development/Libraries/C and C++ - -Requires: pkgconfig(lib3270) -Requires: pkgconfig(libv3270) -Requires: pkgconfig(gtk+-3.0) +%package keypads +Summary: Keypads for %{name} +Group: System/X11/Terminals Requires: %{name} = %{version} -Requires: libpw3270-%{_libvrs} +BuildArch: noarch -%description -n %{name}-devel +Provides: pw3270-keypads = %{version} +Conflicts: otherproviders(pw3270-keypads) +Enhances: %{name} + +%description keypads 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. -This package contains the development files for %{name}. +This package contains the keypads for %{name}. #---[ Build & Install ]----------------------------------------------------------------------------------------------- %prep +%setup -%setup -q -n pw3270-%{version} - +%global _lto_cflags %{_lto_cflags} -ffat-lto-objects NOCONFIGURE=1 ./autogen.sh -%configure \ - --with-release=%{release} +%configure --with-release=%{release} CFLAGS="${CFLAGS} -fpie" LDFLAGS="${LDFLAGS} -pie" %build -make clean +make %{?_smp_mflags} clean # parallel build is broken make all -j1 @@ -212,9 +159,6 @@ make all -j1 %install %make_install -# Remove static library -rm -f %{buildroot}/%{_libdir}/*.a - %find_lang pw3270 langfiles %fdupes %{buildroot}/%{_prefix} @@ -222,53 +166,34 @@ rm -f %{buildroot}/%{_libdir}/*.a #---[ Files ]--------------------------------------------------------------------------------------------------------- %files -f langfiles -%defattr(-,root,root) -%doc AUTHORS LICENSE README.md -%if 0%{?_help2man} -%{_mandir}/*/* -%endif +%license LICENSE +%doc AUTHORS README.md # Main application -%dir %{_datadir}/pw3270 -%dir %{_datadir}/pw3270/ui -%dir %{_libdir}/pw3270-plugins +%dir %{_datadir}/%{_product} +%dir %{_datadir}/%{_product}/ui +%dir %{_datadir}/%{_product}/keypad +%dir %{_libdir}/%{_product}-plugins -%{_bindir}/pw3270 +%{_bindir}/%{_product} +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/*.png -%files -n libpw3270-%{_libvrs} -%defattr(-,root,root) -%{_libdir}/libpw3270.so.%{MAJOR_VERSION}.%{MINOR_VERSION} -%{_libdir}/libpw3270.so.%{MAJOR_VERSION} +%{_datadir}/glib-2.0/schemas/*.xml %files branding -%defattr(-,root,root) +%{_datadir}/%{_product}/ui/* +%{_datadir}/%{_product}/*.png -%{_datadir}/applications/pw3270.desktop -%{_datadir}/pw3270/ui/00default.xml -%{_datadir}/pw3270/ui/10functions.xml -%{_datadir}/pw3270/ui/10keypad.xml -%{_datadir}/pw3270/pw3270.png -%{_datadir}/pw3270/pw3270-logo.png -%{_datadir}/pixmaps/pw3270.png - -%files devel - -%{_includedir}/pw3270.h -%{_includedir}/pw3270cpp.h -%{_includedir}/pw3270 - -%{_libdir}/libpw3270.so - -%{_libdir}/pkgconfig/pw3270.pc -%{_datadir}/pw3270/locale - -%{_datadir}/pw3270/ui/98trace.xml -%{_datadir}/pw3270/ui/99debug.xml +%files keypads +%{_datadir}/%{_product}/keypad/* #---[ Scripts ]------------------------------------------------------------------------------------------------------- -%post -n libpw3270-%{_libvrs} -p /sbin/ldconfig -%postun -n libpw3270-%{_libvrs} -p /sbin/ldconfig +%post +%glib2_gsettings_schema_post -%changelog +%postun +%glib2_gsettings_schema_postun +%changelog -- libgit2 0.21.2