rpms/ldapjdk
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't rely on build-jar-repository for locating JVM extension JARs

Browse Source 
Resolves: rhbz#1488851

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
Mikolaj Izdebski 2017-09-06 13:18:59 +02:00
parent 9822ba5bd6
commit 7e1bdcda7a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ldapjdk.spec
View File

@ -4,7 +4,7 @@
Name: ldapjdk Name: ldapjdk
Version: 4.19 Version: 4.19
Release: 2%{?dist} Release: 3%{?dist}
Epoch: 0 Epoch: 0
Summary: The Mozilla LDAP Java SDK Summary: The Mozilla LDAP Java SDK
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -22,7 +22,7 @@ Requires: jpackage-utils >= 0:1.5
Requires: jss Requires: jss
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: javapackages-local
BuildRequires: jss BuildRequires: jss
Provides: jndi-ldap = 1.3.0 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) rm -fr $(find . -name CVS -type d)
# Link to build-system BRs # Link to build-system BRs
pwd 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 cd java-sdk
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
sh -x ant dist sh -x ant dist
@ -90,6 +91,10 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}/* %{_javadocdir}/%{name}/*
%changelog %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 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild