diff --git a/ldap-sdk-5.1.0.tar.gz b/ldap-sdk-5.1.0.tar.gz deleted file mode 100644 index 9a500d977e251384e63659c2fe659b5ab3e0fcc0..0000000000000000000000000000000000000000 Binary files a/ldap-sdk-5.1.0.tar.gz and /dev/null differ diff --git a/ldap-sdk-5.4.1.tar.gz b/ldap-sdk-5.4.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..64feb4b921d8b2f6fb25e4a7fba3f7a7063df979 Binary files /dev/null and b/ldap-sdk-5.4.1.tar.gz differ diff --git a/ldapjdk.spec b/ldapjdk.spec index aee8039a93c3eb023678b9a42bd4ceecf692df8f..d056e36af5043eb19059dbf589470cf9aa7b6172 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -3,8 +3,8 @@ Summary: LDAP SDK URL: http://www.dogtagpki.org/ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 5.1.0 -Release: 2 +Version: 5.4.1 +Release: 1 Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz 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 @@ -33,36 +33,40 @@ export JAVA_HOME=/usr/lib/jvm/${home_path} dist %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -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 +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + --java-lib-dir=%{_javadir} \ + --javadoc-dir=%{_javadocdir} \ + --install-dir=%{buildroot} \ + install + mkdir -p %{buildroot}%{_mavenpomdir} -sed -i 's/4.22.1-SNAPSHOT/%{version}/g' pom.xml +sed -i 's/5.4.0-SNAPSHOT/%{version}/g' pom.xml +sed -i 's/${revision}/%{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 %{_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 +%{_javadir}/ldapsp.jar +%{_javadir}/ldapfilt.jar +%{_javadir}/ldapbeans.jar +%{_javadir}/ldaptools.jar %{_mavenpomdir}/JPP-ldapjdk.pom +%{_mavenpomdir}/JPP-ldapsp.pom +%{_mavenpomdir}/JPP-ldapfilter.pom +%{_mavenpomdir}/JPP-ldapbeans.pom +%{_mavenpomdir}/JPP-ldaptools.pom %files javadoc %dir %{_javadocdir}/ldapjdk %{_javadocdir}/ldapjdk/* %changelog +* Fri Sep 15 2023 chenchen - 5.4.1-1 +- Upgrade to version 5.4.1 + * Wed Jan 18 2023 xu_ping - 5.1.0-2 - DESC: fix get java_home error