diff --git a/ldapjdk.spec b/ldapjdk.spec index b82882b..ebcdce0 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -28,7 +28,11 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel +%if 0%{?rhel} +BuildRequires: jpackage-utils >= 0:1.5 +%else BuildRequires: javapackages-local +%endif BuildRequires: jss Provides: jndi-ldap = 1.3.0 @@ -58,8 +62,12 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -fr $(find . -name CVS -type d) # Link to build-system BRs pwd +%if 0%{?rhel} +( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi ) +%else ( cd java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 ) ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib +%endif cd java-sdk if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi sh -x ant dist @@ -99,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 +- Fix build for CentOS 7 + * Wed Oct 11 2017 Matthew Harmsen 0:4.19-4 - Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes