From cea915fb2900f0b1244ae7cbaf62768a3f0882bf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 14 Feb 2019 18:19:48 -0200 Subject: [PATCH] Updating build files. --- rpm/_service | 12 +++++++----- rpm/lib3270.spec | 39 ++++++++++++++++++++++++++------------- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/rpm/_service b/rpm/_service index cff08f6..f593ba9 100644 --- a/rpm/_service +++ b/rpm/_service @@ -2,22 +2,24 @@ - enable + enable disable - %ct - + @PARENT_TAG@ http://softwarepublico.gov.br/gitlab/pw3270/lib3270.git git - lib3270-5_2 + + *.tar + */arch/PKGBUILD + + *.tar xz diff --git a/rpm/lib3270.spec b/rpm/lib3270.spec index 76737e6..212a44e 100644 --- a/rpm/lib3270.spec +++ b/rpm/lib3270.spec @@ -38,22 +38,21 @@ #---[ Main package ]-------------------------------------------------------------------------------------------------- -Summary: TN3270 Access library -Name: lib3270-%{_libvrs} -Version: 5.2 -Release: 0 -License: LGPL-3.0 -Source: %{name}-%{version}.tar.xz +Summary: TN3270 Access library +Name: lib3270-%{_libvrs} +Version: 5.2 +Release: 0 +License: LGPL-3.0 +Source: lib3270-%{version}.tar.xz -Url: https://portal.softwarepublico.gov.br/social/pw3270/ +Url: https://portal.softwarepublico.gov.br/social/pw3270/ -Group: Development/Libraries/C and C++ -BuildRoot: /var/tmp/%{name}-%{version} +Group: Development/Libraries/C and C++ +BuildRoot: /var/tmp/%{name}-%{version} -Provides: lib3270_%{_libvrs} -Conflicts: otherproviders(lib3270_%{_libvrs}) +Provides: lib3270_%{_libvrs} +Conflicts: otherproviders(lib3270_%{_libvrs}) -BuildRequires: pkgconfig(openssl) BuildRequires: autoconf >= 2.61 BuildRequires: automake BuildRequires: binutils @@ -62,7 +61,21 @@ BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: m4 BuildRequires: pkgconfig + +%if 0%{?fedora} || 0%{?suse_version} > 1200 + +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libcrypto) + +%else + +BuildRequires: openssl-devel +BuildRequires: dbus-1-devel +BuildRequires: xz + +%endif %description @@ -107,7 +120,7 @@ See more details at https://softwarepublico.gov.br/social/pw3270/ #---[ Build & Install ]----------------------------------------------------------------------------------------------- %prep -%setup +%setup -n lib3270-%{version} NOCONFIGURE=1 ./autogen.sh -- libgit2 0.21.2