a800dadd0f
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/pki-core#8b79c54b742c4a25d28eb51f9909c72ef40ad600
30 lines
932 B
Diff
30 lines
932 B
Diff
From 8c6af8d9c5482ae95c2912ba8553474e9e8e6435 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Scheel <ascheel@redhat.com>
|
|
Date: Wed, 16 Sep 2020 15:49:00 -0400
|
|
Subject: [PATCH 3/3] Fix %{java_version} -> ${java_version}
|
|
|
|
Because java_version isn't a RPM spec file attribute (and is instead an
|
|
inline shell variable), we have to use $ instead of % to reference it.
|
|
|
|
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
|
---
|
|
pki.spec | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pki.spec b/pki.spec
|
|
index 4446d657d..a461f10e8 100644
|
|
--- a/pki.spec
|
|
+++ b/pki.spec
|
|
@@ -855,7 +855,7 @@ cd build
|
|
-DVERSION=%{version}-%{release} \
|
|
-DVAR_INSTALL_DIR:PATH=/var \
|
|
-DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \
|
|
- -DJAVA_VERSION=%{java_version} \
|
|
+ -DJAVA_VERSION=${java_version} \
|
|
-DJAVA_HOME=%java_home \
|
|
-DPKI_JAVA_PATH=%java \
|
|
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
|
|
--
|
|
2.26.2
|
|
|