From 7f77943096ecbb336b309629a5777bbd18b80cb7 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 11 Jul 2018 03:23:47 +0200 Subject: [PATCH] Rebased to JSS 4.5.0-a4 --- .gitignore | 1 + jss.spec | 42 ++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index fc4dd1f..c12f2fb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ jss-4.2.6.tar.gz /jss-4.5.0-a1.tar.gz /jss-4.5.0-a2.tar.gz /jss-4.5.0-a3.tar.gz +/jss-4.5.0-a4.tar.gz diff --git a/jss.spec b/jss.spec index e373259..7af0455 100644 --- a/jss.spec +++ b/jss.spec @@ -8,7 +8,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: 4.5.0 Release: 0.4%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -a3 +%global _phase -a4 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/jss.git @@ -27,24 +27,26 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # > jss-VERSION-RELEASE.patch # Patch: jss-VERSION-RELEASE.patch -Conflicts: idm-console-framework < 1.1.17-4 -Conflicts: pki-base < 10.6.3 -Conflicts: tomcatjss < 7.3.2 +################################################################################ +# Build Dependencies +################################################################################ # autosetup BuildRequires: git +BuildRequires: gcc-c++ BuildRequires: nss-devel >= 3.28.4-6 BuildRequires: nspr-devel >= 4.13.1 BuildRequires: java-devel BuildRequires: jpackage-utils BuildRequires: slf4j -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# no slf4j-jdk14 +%else BuildRequires: slf4j-jdk14 %endif BuildRequires: apache-commons-lang BuildRequires: apache-commons-codec -BuildRequires: ldapjdk %if 0%{?fedora} >= 25 || 0%{?rhel} > 7 BuildRequires: perl-interpreter @@ -54,12 +56,17 @@ Requires: nss >= 3.28.4-6 Requires: java-headless Requires: jpackage-utils Requires: slf4j -%if 0%{?fedora} || 0%{?rhel} > 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# no slf4j-jdk14 +%else Requires: slf4j-jdk14 %endif Requires: apache-commons-lang Requires: apache-commons-codec -Requires: ldapjdk + +Conflicts: idm-console-framework < 1.1.17-4 +Conflicts: pki-base < 10.6.3 +Conflicts: tomcatjss < 7.3.2 %description Java Security Services (JSS) is a java native interface which provides a bridge @@ -154,22 +161,20 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %defattr(-,root,root,-) %doc jss.html MPL-1.1.txt gpl.txt lgpl.txt -%{_libdir}/jss/* +%{_libdir}/* %{_jnidir}/* -%{_libdir}/jss/lib*.so ################################################################################ %files javadoc %defattr(-,root,root,-) -%dir %{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name}-%{version}/* +%{_javadocdir}/%{name}-%{version}/ ################################################################################ %changelog -* Fri Jul 13 2018 Fedora Release Engineering - 4.5.0-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - +* 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 - Rebased to JSS 4.5.0-a3 @@ -179,10 +184,3 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} * Fri Jun 15 2018 Dogtag PKI Team 4.5.0-0.1 - Rebased to JSS 4.5.0-a1 - -* Tue May 29 2018 Dogtag PKI Team 4.4.4-1 -- Rebased to JSS 4.4.4 - -* Thu Apr 05 2018 Dogtag PKI Team 4.4.3-1 -- Rebased to JSS 4.4.3 -- Red Hat Bugzilla #1548548 - Partial Fedora build flags injection diff --git a/sources b/sources index db64094..6625c82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jss-4.5.0-a3.tar.gz) = 76e201b39cd7fbfc48ca1714030c3d9cfbc8a7acb175e371ace5a0dc3c86531c48f1237724338a59959f918e17351d9332fe99f8e059b821edb85230d4d202d9 +SHA512 (jss-4.5.0-a4.tar.gz) = 9a3e8adb87ff18102c7c497f8db40e07ee1efab157dae04e8b15ee49f3dc99069865a829b50ed9b4ee9ef3c649619697f88c31b8ff5461c426b63fec298d5f84