diff --git a/.gitignore b/.gitignore index 540976d..fc4dd1f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ jss-4.2.6.tar.gz /jss-4.4.4.tar.gz /jss-4.5.0-a1.tar.gz /jss-4.5.0-a2.tar.gz +/jss-4.5.0-a3.tar.gz diff --git a/jss.spec b/jss.spec index 95b1668..ed29f10 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.2%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -a2 +Release: 0.3%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -a3 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -28,8 +28,8 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # Patch: jss-VERSION-RELEASE.patch Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.4.0 -Conflicts: tomcatjss < 7.2.1 +Conflicts: pki-base < 10.6.3 +Conflicts: tomcatjss < 7.3.2 # autosetup BuildRequires: git @@ -168,6 +168,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ################################################################################ %changelog +* Thu Jul 5 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 - Rebased to JSS 4.5.0-a2 diff --git a/sources b/sources index da70cb7..db64094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-a2.tar.gz) = 88af85f0819f46e2829bbe99566098aceb531c734b4820d08c7244374f11961dbc17535c198d832b1c1e579ba0598dd46048bfdbac5ea868823959c49ffebb49 +SHA512 (jss-4.5.0-a3.tar.gz) = 76e201b39cd7fbfc48ca1714030c3d9cfbc8a7acb175e371ace5a0dc3c86531c48f1237724338a59959f918e17351d9332fe99f8e059b821edb85230d4d202d9