diff --git a/ldapjdk.spec b/ldapjdk.spec index ebcdce0..ef9690a 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -28,7 +28,7 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel -%if 0%{?rhel} +%if 0%{?rhel} <= 7 BuildRequires: jpackage-utils >= 0:1.5 %else BuildRequires: javapackages-local @@ -62,7 +62,7 @@ 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} +%if 0%{?rhel} <= 7 ( 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 ) @@ -107,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 +- fix some conditionals + * Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 - Fix build for CentOS 7