From 7e1bdcda7a4b3887ec4ead237c5afb731e3e8653 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sep 06 2017 11:24:22 +0000
Subject: Don't rely on build-jar-repository for locating JVM extension JARs


Resolves: rhbz#1488851

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/ldapjdk.spec b/ldapjdk.spec
index bb02af7..76398b6 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -4,7 +4,7 @@
 
 Name:		ldapjdk
 Version:	4.19
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
@@ -22,7 +22,7 @@ Requires:	jpackage-utils >= 0:1.5
 Requires:       jss
 BuildRequires:  ant
 BuildRequires:  java-devel
-BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:  javapackages-local
 BuildRequires:  jss
 
 Provides:	jndi-ldap = 1.3.0
@@ -50,7 +50,8 @@ 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
-( cd  java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi )
+( 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
 cd java-sdk
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
 sh -x ant dist
@@ -90,6 +91,10 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}/*
 
 %changelog
+* Wed Sep  6 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:4.19-3
+- Don't rely on build-jar-repository for locating JVM extension JARs
+- Resolves: rhbz#1488851
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.19-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild