diff --git a/ldap-sdk-4.22.0.tar.gz b/ldap-sdk-4.22.0.tar.gz deleted file mode 100644 index 290fe3029e379b0305f730f6ccbbcb383356c779..0000000000000000000000000000000000000000 Binary files a/ldap-sdk-4.22.0.tar.gz and /dev/null differ diff --git a/ldap-sdk-5.1.0.tar.gz b/ldap-sdk-5.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9a500d977e251384e63659c2fe659b5ab3e0fcc0 Binary files /dev/null and b/ldap-sdk-5.1.0.tar.gz differ diff --git a/ldapjdk.spec b/ldapjdk.spec index 8ff2cb5582bf551eb17fa4faeef7568ab458f0d3..6e661a947a62c44bbcf44c9e863c2c763067bf71 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -3,11 +3,11 @@ Summary: LDAP SDK URL: http://www.dogtagpki.org/ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.22.0 -Release: 5 +Version: 5.1.0 +Release: 1 Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz -BuildRequires: ant java-devel javapackages-local slf4j slf4j-jdk14 jss >= 4.6.0 -Requires: jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 4.6.0 +BuildRequires: ant java-latest-openjdk-devel javapackages-local slf4j slf4j-jdk14 jss >= 5.1.0 +Requires: java-latest-openjdk-headless jpackage-utils >= 0:1.5 slf4j slf4j-jdk14 jss >= 5.1.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -21,44 +21,50 @@ Javadoc for ldapjdk %prep %autosetup -n ldap-sdk-%{version} -p 1 -rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar %build -pwd -( 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 +home_path=`ls /usr/lib/jvm | grep java-18-openjdk-18` +export JAVA_HOME=/usr/lib/jvm/${home_path} + +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + dist %install install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar -install -m 644 java-sdk/dist/packages/ldapsp.jar $RPM_BUILD_ROOT%{_javadir}/ldapsp.jar -install -m 644 java-sdk/dist/packages/ldapfilt.jar $RPM_BUILD_ROOT%{_javadir}/ldapfilt.jar -install -m 644 java-sdk/dist/packages/ldapbeans.jar $RPM_BUILD_ROOT%{_javadir}/ldapbeans.jar +install -m 644 %{_vpath_builddir}/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar +install -m 644 %{_vpath_builddir}/packages/ldapsp.jar $RPM_BUILD_ROOT%{_javadir}/ldapsp.jar +install -m 644 %{_vpath_builddir}/packages/ldapfilt.jar $RPM_BUILD_ROOT%{_javadir}/ldapfilt.jar +install -m 644 %{_vpath_builddir}/packages/ldapbeans.jar $RPM_BUILD_ROOT%{_javadir}/ldapbeans.jar install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0 pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 ln -fs ../java/*ldapsp.jar jndi-ldap.jar popd mkdir -p %{buildroot}%{_mavenpomdir} -sed -i 's/@VERSION@/%{version}/g' ldapjdk.pom -install -pm 644 ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom +sed -i 's/4.22.1-SNAPSHOT/%{version}/g' pom.xml +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom %add_maven_depmap JPP-ldapjdk.pom ldapjdk.jar -a "ldapsdk:ldapsdk" install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk -cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk +cp -r %{_vpath_builddir}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk + %files -f .mfiles +%{_javadir}/ldapjdk.jar %{_javadir}/ldapsp*.jar %{_javadir}/ldapfilt*.jar %{_javadir}/ldapbeans*.jar %{_javadir}-1.3.0/*.jar +%{_mavenpomdir}/JPP-ldapjdk.pom %files javadoc %dir %{_javadocdir}/ldapjdk %{_javadocdir}/ldapjdk/* %changelog +* Thu Jun 2 2022 Ge Wang - 5.1.0-1 +- DESC: upgrade versoin to 5.1.0 + * Fri Jul 30 2021 chenyanpanHW - 4.22.0-5 - DESC: delete -S git from %autosetup, and delete BuildRequires git