The package rpms/pki-core.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pki-core.git/commit/?id=f8324ca7a....
Change:
+ExcludeArch: aarch64 s390x
Thanks.
Full change:
============
commit f8324ca7afd7f8b36a065f4799f56386674c957c
Author: Endi S. Dewata <edewata(a)redhat.com>
Date: Fri Jun 29 04:53:30 2018 +0200
Fixed macro evaluation
diff --git a/pki-core.spec b/pki-core.spec
index 99cf0e5..d21074b 100644
--- a/pki-core.spec
+++ b/pki-core.spec
@@ -4,23 +4,28 @@ Name: pki-core
Summary: Dogtag PKI Core Package
URL:
http://www.dogtagpki.org/
-License: GPLv2
+# The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
+License: GPLv2 and LGPLv2
-%if 0%{?rhel}
-Version: 10.6.2
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no arch exclusion
%else
-Version: 10.6.2
-Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
+# Exclude 'aarch64' and 's390x' architectures since
+# 'esc' does not exist on these two platforms
+ExcludeArch: aarch64 s390x
%endif
+Version: 10.6.2
+Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
+# global _phase -a1
+
# To create a tarball from a version tag:
# $ git archive \
# --format=tar.gz \
# --prefix pki-<version>/ \
# -o pki-<version>.tar.gz \
# <version tag>
-Source:
https://github.com/dogtagpki/pki/archive/v%{version}/pki-%{version}.tar.gz
+Source:
https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{vers...
# To create a patch for all changes since a version tag:
# $ git format-patch \
@@ -33,10 +38,10 @@ Source:
https://github.com/dogtagpki/pki/archive/v%{version}/pki-%{version}.tar.
# NSS
################################################################################
-%if 0%{?fedora} >= 28 || 0%{?rhel} > 7
-%global nss_default_db_type sql
-%else
+%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <=
27
%global nss_default_db_type dbm
+%else
+%global nss_default_db_type sql
%endif
################################################################################
@@ -48,14 +53,14 @@ Source:
https://github.com/dogtagpki/pki/archive/v%{version}/pki-%{version}.tar.
%if 0%{?rhel} && 0%{?rhel} <= 7 || 0%{?fedora} && 0%{?fedora} <=
28
%global with_python2 1
%else
-%global with_python2 0
+# no python2
%endif
%endif
# Python 3 packages
%if 0%{!?with_python3:1}
%if 0%{?rhel} && 0%{?rhel} <= 7
-%global with_python3 0
+# no python3
%else
%global with_python3 1
%endif
@@ -141,7 +146,9 @@ BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
BuildRequires: jakarta-commons-httpclient
BuildRequires: slf4j
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no slf4j-jdk14
+%else
BuildRequires: slf4j-jdk14
%endif
BuildRequires: nspr-devel
@@ -403,7 +410,9 @@ BuildArch: noarch
Obsoletes: pki-base-python2 < %{version}
Provides: pki-base-python2 = %{version}-%{release}
+%if 0%{?fedora}
%{?python_provide:%python_provide python2-pki}
+%endif
Requires: pki-base >= %{version}-%{release}
Requires: python2-cryptography
@@ -432,7 +441,9 @@ BuildArch: noarch
Obsoletes: pki-base-python3 < %{version}
Provides: pki-base-python3 = %{version}-%{release}
+%if 0%{?fedora}
%{?python_provide:%python_provide python3-pki}
+%endif
Requires: pki-base >= %{version}-%{release}
Requires: python3-cryptography
@@ -532,7 +543,6 @@ Certificate System into a more complete and robust PKI solution.
################################################################################
Summary: PKI Server Package
-
BuildArch: noarch
Provides: pki-deploy = %{version}-%{release}
@@ -816,7 +826,6 @@ smart card.
################################################################################
Summary: PKI Javadoc Package
-
BuildArch: noarch
Provides: pki-util-javadoc = %{version}-%{release}
@@ -836,7 +845,7 @@ This package contains PKI API documentation.
%prep
################################################################################
-%autosetup -n pki-%{version} -p 1 -S git
+%autosetup -n pki-%{version}%{?_phase} -p 1 -S git
################################################################################
%build
@@ -858,7 +867,7 @@ cd build
-DBUILD_PKI_CORE:BOOL=ON \
-DWITH_PYTHON2:BOOL=%{?with_python2:ON}%{!?with_python2:OFF} \
-DWITH_PYTHON3:BOOL=%{?with_python3:ON}%{!?with_python3:OFF} \
-%if %{?with_python3_default}
+%if 0%{?with_python3_default}
-DWITH_PYTHON3_DEFAULT:BOOL=ON \
%endif
-DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \
@@ -897,12 +906,12 @@ cd build
%endif
# Customize client library links in /usr/share/pki/lib
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no link customization
+%else
rm -f %{buildroot}%{_datadir}/pki/lib/scannotation.jar
ln -sf /usr/share/java/jboss-logging/jboss-logging.jar
%{buildroot}%{_datadir}/pki/lib/jboss-logging.jar
ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar
%{buildroot}%{_datadir}/pki/lib/jboss-annotations-api_1.2_spec.jar
-%else
-
%endif
%if %{with server}
@@ -968,7 +977,9 @@ fi
%endif
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no pylint
+%else
################################################################################
echo "Scanning Python code with pylint"
@@ -1014,11 +1025,13 @@ if [ $? -ne 0 ]; then
fi
%endif # with_python3
-%endif # Fedora / RHEL > 7
+%endif
%endif # with server
-%if 0%{?fedora} || 0%{?rhel} > 7
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# no upgrade check
+%else
%pretrans -n pki-base -p <lua>
function test(a)
if posix.stat(a) then
@@ -1035,12 +1048,12 @@ if (test("/etc/sysconfig/pki/ca") or
test("/etc/sysconfig/pki/kra") or
test("/etc/sysconfig/pki/ocsp") or
test("/etc/sysconfig/pki/tks")) then
- msg = "Unable to upgrade to Fedora 20. There are Dogtag 9 instances\n" ..
+ msg = "Unable to upgrade to Fedora 20. There are PKI 9 instances\n" ..
"that will no longer work since they require Tomcat 6, and \n" ..
"Tomcat 6 is no longer available in Fedora 20.\n\n" ..
"Please follow these instructions to migrate the instances to \n" ..
- "Dogtag 10:\n\n" ..
-
"http://www.dogtagpki.org/wiki/Migrating_Dogtag_9_Instances_to_Dogtag_10"
+ "PKI 10:\n\n" ..
+ "http://www.dogtagpki.org/wiki/Migrating_PKI_9_Instances_to_PKI_10"
error(msg)
end
%endif
@@ -1146,7 +1159,7 @@ fi
%{_mandir}/man5/pki-logging.5.gz
%{_mandir}/man8/pki-upgrade.8.gz
-%if %{with_python2}
+%if 0%{?with_python2}
################################################################################
%files -n python2-pki
################################################################################
@@ -1174,7 +1187,7 @@ fi
%{_javadir}/pki/pki-nsutil.jar
%{_javadir}/pki/pki-certsrv.jar
-%if %{with_python3}
+%if 0%{?with_python3}
################################################################################
%files -n python3-pki
################################################################################
@@ -1396,10 +1409,12 @@ fi
################################################################################
%changelog
+* Thu Jun 28 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.2-3
+- Fixed macro expressions
+
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 10.6.2-2
- Rebuilt for Python 3.7
-
* Fri Jun 15 2018 Dogtag PKI Team <pki-devel(a)redhat.com> - 10.6.2-1
- Rebased to PKI 10.6.2