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..47e913f719efed11426e9de605da458ff7e9131c --- /dev/null +++ b/ldap-sdk-5.4.1.tar.gz @@ -0,0 +1,76 @@ +Name: ldapjdk +Summary: LDAP SDK +URL: http://www.dogtagpki.org/ +License: MPLv1.1 or GPLv2+ or LGPLv2+ +BuildArch: noarch +Version: 5.4.1 +Release: 1 +Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}/ldap-sdk-%{version}.tar.gz +BuildRequires: ant java-17-openjdk-devel javapackages-local slf4j slf4j-jdk14 jss >= 5.1.0 +Requires: java-17-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, +manage, and update the information stored in an LDAP directory. +%license docs/ldapjdk/license.txt + +%package javadoc +Summary: Javadoc for ldapjdk +%description javadoc +Javadoc for ldapjdk + +%prep +%autosetup -n ldap-sdk-%{version} -p 1 + +%build +export JAVA_HOME=%{_jvmdir}/jre-17-openjdk + +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + dist + +%install +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + --java-lib-dir=%{_javadir} \ + --javadoc-dir=%{_javadocdir} \ + --install-dir=%{buildroot} \ + install + +%files +%{_javadir}/ldapjdk.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 + +* 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 + +* Thu Jul 23 2020 yaokai - 4.22.0-4 +- Fix the wrong requires + +* Thu Jul 16 2020 yaokai - 4.22.0-3 +- package init diff --git a/ldapjdk.spec b/ldapjdk.spec index aee8039a93c3eb023678b9a42bd4ceecf692df8f..47e913f719efed11426e9de605da458ff7e9131c 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: 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 +BuildRequires: ant java-17-openjdk-devel javapackages-local slf4j slf4j-jdk14 jss >= 5.1.0 +Requires: java-17-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, @@ -23,9 +23,7 @@ Javadoc for ldapjdk %autosetup -n ldap-sdk-%{version} -p 1 %build -openjdk_latest_version=`rpm -qi java-latest-openjdk-headless | grep Version | cut -b 15-16` -home_path=`ls /usr/lib/jvm | grep java-${openjdk_latest_version}-openjdk-${openjdk_latest_version}` -export JAVA_HOME=/usr/lib/jvm/${home_path} +export JAVA_HOME=%{_jvmdir}/jre-17-openjdk ./build.sh \ %{?_verbose:-v} \ @@ -33,36 +31,35 @@ 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 -mkdir -p %{buildroot}%{_mavenpomdir} -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 %{_vpath_builddir}/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk - +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + --java-lib-dir=%{_javadir} \ + --javadoc-dir=%{_javadocdir} \ + --install-dir=%{buildroot} \ + install -%files -f .mfiles +%files %{_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 diff --git a/test_A001 b/test_A001 new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/test_B001 b/test_B001 new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391