diff --git a/.gitignore b/.gitignore index e0c8d0e..161c7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ tomcatjss-1.2.0.tar.gz /tomcatjss-7.1.4.tar.gz /tomcatjss-7.2.0.tar.gz /tomcatjss-7.2.1.tar.gz +/tomcatjss-7.2.2.tar.gz diff --git a/sources b/sources index 3195e7a..f51ec3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.2.1.tar.gz) = a1df56d21aedee05af6757624ad3c803925e1861cd90addd84d12f5039876f3059db47127993938188fa52b55b02dc85ed6470fac47eebb123f7a7dde98f3dd2 +SHA512 (tomcatjss-7.2.2.tar.gz) = 7b89dfed66c02feade73fc991bd0af91283d229e3e91e27f0fa4e8e9c7b18708ed4e504d50ac9c860ce8a4fc9dc7d591a7e07a855b2b63058837071a45226092 diff --git a/tomcatjss.spec b/tomcatjss.spec index 7654eb9..fb6ecdb 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -1,6 +1,6 @@ Name: tomcatjss -Version: 7.2.1 -Release: 2%{?dist} +Version: 7.2.2 +Release: 1%{?dist} Summary: JSSE implementation using JSS for Tomcat URL: http://pki.fedoraproject.org/ License: LGPLv2+ @@ -19,7 +19,11 @@ BuildRequires: ant BuildRequires: apache-commons-lang BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.7.5-15 -BuildRequires: jss >= 4.4.0 +%if 0%{?fedora} +BuildRequires: jss >= 4.4.1 +%else +BuildRequires: jss >= 4.4.0-4 +%endif %if 0%{?fedora} >= 23 BuildRequires: tomcat >= 8.0.18 %else @@ -33,7 +37,11 @@ Requires: java-headless Requires: java %endif Requires: jpackage-utils >= 0:1.7.5-15 -Requires: jss >= 4.4.0 +%if 0%{?fedora} +Requires: jss >= 4.4.1 +%else +Requires: jss >= 4.4.0-4 +%endif %if 0%{?fedora} >= 23 Requires: tomcat >= 8.0.18 %else @@ -92,6 +100,10 @@ rm -rf %{buildroot} %{_javadir}/* %changelog +* Mon Mar 27 2017 Matthew Harmsen - 7.2.2-1 +- tomcatjss Pagure Issue #6 - Rebase tomcatjss to 7.2.x in Fedora 25+ (mharmsen) +- tomcatjss Pagure Issue #4 - Support for Event API (edewata) + * Tue Mar 21 2017 Matthew Harmsen - 7.2.1-2 - Bugzilla Bug #1434541 - tomcatjss 7.2.1 is incompatible with versions of pki-base < 10.4.0 @@ -105,8 +117,8 @@ rm -rf %{buildroot} included inside the tarball * Sun Mar 12 2017 Matthew Harmsen 7.2.0-1 -- tomcatjss Pagure Issue #6 - Rebase tomcatjss to 7.2.0 in Fedora 25+ (mharmsen) -- Bugzilla Bug #1394416 - Rebase tomcatjss to 7.2.0 in RHEL 7.4 (mharmsen) +- tomcatjss Pagure Issue #6 - Rebase tomcatjss to 7.2.x in Fedora 25+ (mharmsen) +- Bugzilla Bug #1394416 - Rebase tomcatjss to 7.2.x in RHEL 7.4 (mharmsen) * Sat Feb 11 2017 Fedora Release Engineering - 7.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild