Accepting request 1120323 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1120323
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libksba?expand=0&rev=46
This commit is contained in:
Ana Guerrero 2023-10-27 20:27:04 +00:00 committed by Git OBS Bridge
commit 252ce21749
3 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,24 @@
Index: libksba-1.6.4/autogen.sh
===================================================================
--- libksba-1.6.4.orig/autogen.sh
+++ libksba-1.6.4/autogen.sh
@@ -222,7 +222,7 @@ if [ "$myhost" = "find-version" ]; then
esac
beta=no
- if [ -d .git ]; then
+ if false; then
ingit=yes
tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
if [ -n "$tmp" ]; then
@@ -236,8 +236,8 @@ if [ "$myhost" = "find-version" ]; then
rvd=$((0x$(echo ${rev} | head -c 4)))
else
ingit=no
- beta=yes
- tmp="-unknown"
+ beta=no
+ tmp=""
rev="0000000"
rvd="0"
fi

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Oct 17 10:27:15 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
- Do not pull revision info from GIT when autoconf is run. This
removes the -unknown suffix after the version number.
* Run autoreconf for the added patch and add the build
dependecies on autoconf, automake and libtool.
* Add libksba-nobetasuffix.patch [bsc#1216334]
-------------------------------------------------------------------
Tue Jun 20 07:10:20 UTC 2023 - Pedro Monreal <pmonreal@suse.com>

View File

@ -29,6 +29,11 @@ Source2: https://gnupg.org/ftp/gcrypt/libksba/%{name}-%{version}.tar.bz2.
# https://www.gnupg.org/signature_key.html
Source3: %{name}.keyring
Source4: libksba.changes
#PATCH-FIX-OPENSUSE Do not pull revision info from GIT when autoconf is run
Patch0: libksba-nobetasuffix.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gpg-error) >= 1.8
@ -63,6 +68,7 @@ libksba.
%autosetup -p1
%build
autoreconf -vfi
build_timestamp=$(date -u +%{Y}-%{m}-%{dT}%{H}:%{M}+0000 -r %{SOURCE4})
%configure \
--disable-static \