Rebase to LDAP SDK 5.0.0-alpha2

This commit is contained in:
Endi S. Dewata 2021-08-12 13:05:23 -05:00
parent 1fbd71e227
commit 0a4681e6cc
3 changed files with 28 additions and 42 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ ldapjdk-4.18.tar.gz
/ldap-sdk-4.22.0.tar.gz
/ldap-sdk-4.23.0-alpha1.tar.gz
/ldap-sdk-5.0.0-alpha1.tar.gz
/ldap-sdk-5.0.0-alpha2.tar.gz

View File

@ -11,12 +11,8 @@ BuildArch: noarch
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 5.0.0
Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -alpha1
%global spname ldapsp
%global filtname ldapfilt
%global beansname ldapbeans
Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -alpha2
# To create a tarball from a version tag:
# $ git archive \
@ -72,10 +68,10 @@ manage, and update the information stored in an LDAP directory.
%package javadoc
################################################################################
Summary: Javadoc for %{name}
Summary: Javadoc for LDAP SDK
%description javadoc
Javadoc for %{name}
Javadoc for LDAP SDK
################################################################################
%prep
@ -83,51 +79,37 @@ Javadoc for %{name}
%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
# Remove all bundled jars, we must build against build-system jars
rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
################################################################################
%build
################################################################################
pushd java-sdk/ldapjdk/lib
build-jar-repository -s -p . jss
popd
ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
pushd java-sdk
export JAVA_HOME=%{java_home}
sh -x ant dist
popd
./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/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
mkdir -p %{buildroot}%{_mavenpomdir}
install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
./build.sh \
%{?_verbose:-v} \
--work-dir=%{_vpath_builddir} \
--java-lib-dir=%{_javadir} \
--javadoc-dir=%{_javadocdir} \
--install-dir=%{buildroot} \
install
################################################################################
%files
################################################################################
%{_javadir}/%{name}.jar
%{_javadir}/%{spname}*.jar
%{_javadir}/%{filtname}*.jar
%{_javadir}/%{beansname}*.jar
%{_javadir}/ldapjdk.jar
%{_javadir}/ldapsp.jar
%{_javadir}/ldapfilt.jar
%{_javadir}/ldapbeans.jar
%{_mavenpomdir}/JPP-ldapjdk.pom
%{_mavenpomdir}/JPP-ldapsp.pom
%{_mavenpomdir}/JPP-ldapfilter.pom
@ -137,13 +119,16 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files javadoc
################################################################################
%dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name}/*
%dir %{_javadocdir}/ldapjdk
%{_javadocdir}/ldapjdk/*
################################################################################
%changelog
* Thu Aug 12 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.3.alpha2
- Rebase to LDAP SDK 5.0.0-alpha2
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.0-0.2.alpha1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1
* Tue Jun 22 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 5.0.0-0.1.alpha1
- Rebase to LDAP SDK 5.0.0-alpha1

View File

@ -1 +1 @@
SHA512 (ldap-sdk-5.0.0-alpha1.tar.gz) = dcb1f0da5f7aaaa76151a2c9fc687dbdfec382919177fe38a78f58a1bfcbe9033a5f087755653883cbdfabc762a6ce7d008df3dc4c14854036f3087f7e2568a7
SHA512 (ldap-sdk-5.0.0-alpha2.tar.gz) = 93deac5ff78de1b02f177249a5ecbd43782c85e788a18178ed33184ef6b94ee2c8c47963e8e3f23d29a8e4ca7806190804c43cf1d07bf51882335210a7b13081