From eec3e6f0c8e38044c7fd9b8852749cf1960bc3a0 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 10 Aug 2018 22:53:52 +0200 Subject: [PATCH] Rebased to JSS 4.5.0 --- .gitignore | 1 + jss.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ce97b1d..521c173 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-a3.tar.gz /jss-4.5.0-a4.tar.gz /jss-4.5.0-b1.tar.gz +/jss-4.5.0.tar.gz diff --git a/jss.spec b/jss.spec index 0ac8ea0..8e63e81 100644 --- a/jss.spec +++ b/jss.spec @@ -7,8 +7,8 @@ URL: http://www.dogtagpki.org/wiki/JSS License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 -Release: 0.6%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -b1 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +# global _phase -a1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -65,9 +65,10 @@ Requires: slf4j-jdk14 Requires: apache-commons-lang Requires: apache-commons-codec -Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.5 +Conflicts: ldapjdk < 4.20 +Conflicts: idm-console-framework < 1.2 Conflicts: tomcatjss < 7.3.4 +Conflicts: pki-base < 10.6.5 %description Java Security Services (JSS) is a java native interface which provides a bridge @@ -174,17 +175,20 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog -* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.6 +* Fri Aug 10 2018 Dogtag PKI Team 4.5.0-1 +- Rebased to JSS 4.5.0 + +* Tue Aug 07 2018 Dogtag PKI Team 4.5.0-0.6 - Rebased to JSS 4.5.0-b1 -* Tue Aug 7 2018 Dogtag PKI Team 4.5.0-0.5 +* Tue Aug 07 2018 Dogtag PKI Team 4.5.0-0.5 - Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3) * Fri Jul 20 2018 Dogtag PKI Team 4.5.0-0.4 - Rebased to JSS 4.5.0-a4 - Red Hat Bugzilla #1604462 - jss: FTBFS in Fedora rawhide -* Thu Jul 5 2018 Dogtag PKI Team 4.5.0-0.3 +* Thu Jul 05 2018 Dogtag PKI Team 4.5.0-0.3 - Rebased to JSS 4.5.0-a3 * Fri Jun 22 2018 Dogtag PKI Team 4.5.0-0.2 diff --git a/sources b/sources index 623be8c..e88e6d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-b1.tar.gz) = e5f5efbcf3e75c2e343e5531e11e131cd7704d4397adc419011eb1190d4aca44e4b9344ca2b985aaeb9823b377d01057f9736515c01d61676cd08f34dafe5300 +SHA512 (jss-4.5.0.tar.gz) = abebd75104f747a95dc3160dc6218c549235f5c9ee2d416299bfe132072b76fb7f0fec4ce2664931bf971280836ab0eb26746f964c13300393fa6a5937f81cda