Ana Guerrero 2024-02-05 21:01:47 +00:00 committed by Git OBS Bridge
commit 617707e029
2 changed files with 15 additions and 7 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Feb 2 08:23:13 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix build using RPM 4.19: builddir does contain the extracted
tartball, but can also contain special directories used by RPM,
resolving in globbing to behave differently.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 13 15:18:20 UTC 2023 - Stefan Schubert <schubi@suse.com> Mon Nov 13 15:18:20 UTC 2023 - Stefan Schubert <schubi@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package fdo-client # spec file for package fdo-client
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -33,10 +33,10 @@ Patch0: build.patch
Patch1: gcc.patch Patch1: gcc.patch
Requires: openssl Requires: openssl
BuildRequires: cmake BuildRequires: cmake
BuildRequires: vim
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libopenssl-devel
BuildRequires: libcurl-devel BuildRequires: libcurl-devel
BuildRequires: libopenssl-devel
BuildRequires: vim
%{?systemd_ordering} %{?systemd_ordering}
%description %description
@ -59,18 +59,19 @@ credentials while porting this to different platforms.
%setup -q %setup -q
%setup -q -D -a 1 %setup -q -D -a 1
%setup -q -D -a 2 %setup -q -D -a 2
%patch0 -p1 %patch -P 0 -p1
%patch1 -p1 %patch -P 1 -p1
%build %build
echo "%_builddir"
pushd . pushd .
cd safestringlib* cd safestringlib*
mkdir obj mkdir obj
make make
popd popd
cd tinycbor* pushd tinycbor*
make make
cd %{_builddir}/%{name}* popd
export SAFESTRING_ROOT=%{_builddir}/%{name}-%{version}/safestringlib-1.0.0+git20171208.5da1bad export SAFESTRING_ROOT=%{_builddir}/%{name}-%{version}/safestringlib-1.0.0+git20171208.5da1bad
export TINYCBOR_ROOT=%{_builddir}/%{name}-%{version}/tinycbor-1.0.0+git20191022.755f9ef export TINYCBOR_ROOT=%{_builddir}/%{name}-%{version}/tinycbor-1.0.0+git20191022.755f9ef
export BLOB_PATH=%{_sharedstatedir}/%{name} export BLOB_PATH=%{_sharedstatedir}/%{name}