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

- RPM was using pre-built jars before. Fixed that problem.

Browse Source
This commit is contained in:
Deepak Bhole 2009-03-20 20:56:37 +00:00
parent 71de5258ca
commit 5aeade89e6
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ldapjdk-jarnamefix.patch Normal file
View File

@ -0,0 +1,14 @@
diff -up ./mozilla/directory/java-sdk/build.xml.sav ./mozilla/directory/java-sdk/build.xml
--- ./mozilla/directory/java-sdk/build.xml.sav 2009-03-20 16:41:48.000000000 -0400
+++ ./mozilla/directory/java-sdk/build.xml 2009-03-20 16:42:09.000000000 -0400
@@ -66,8 +66,8 @@
<!-- the following is to setup the correct info for sun jsse which
is jdk dependent -->
- <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss32_stub.jar"/>
- <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss32_stub.jar"/>
+ <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss4.jar"/>
+ <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss4.jar"/>
<!-- we do not use the users existing classpath and instead build our own
comment the following line out if this is not desired -->

27
ldapjdk.spec
View File

@ -9,7 +9,7 @@
Name: ldapjdk Name: ldapjdk
Version: 4.18 Version: 4.18
Release: 3%{?dist} Release: 4%{?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+
@ -19,6 +19,7 @@ URL: http://www.mozilla.org/directory/javasdk.html
# cvs -d:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot Export -r LDAPJavaSDK_418 DirectorySDKSourceJava # cvs -d:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot Export -r LDAPJavaSDK_418 DirectorySDKSourceJava
# tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18 # tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Patch0: %{name}-jarnamefix.patch
Requires: jaas Requires: jaas
Requires: jndi Requires: jndi
@ -57,27 +58,30 @@ Obsoletes: openjmx-javadoc
Javadoc for %{name} Javadoc for %{name}
%prep %prep
%setup -q -c %setup -q
# Remove all bundled jars, we must build against build-system jars # Remove all bundled jars, we must build against build-system jars
rm -f ./mozilla/directory/java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -f ./mozilla/directory/java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
%patch0 -p1
%build %build
# cleanup CVS dirs # cleanup CVS dirs
rm -fr $(find . -name CVS -type d) rm -fr $(find . -name CVS -type d)
# Link to build-system BRs # Link to build-system BRs
( cd mozilla/directory/java-sdk/ldapjdk/lib && build-jar-repository . jss4 jsse jaas jndi ) pwd
cd %{name}-%{version}/mozilla/directory/java-sdk ( cd mozilla/directory/java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi )
cd mozilla/directory/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 -d dist sh -x ant dist
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 %{name}-%{version}/mozilla/directory/java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar install -m 644 mozilla/directory/java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 %{name}-%{version}/mozilla/directory/java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}-%{version}.jar install -m 644 mozilla/directory/java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}-%{version}.jar
install -m 644 %{name}-%{version}/mozilla/directory/java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}-%{version}.jar install -m 644 mozilla/directory/java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}-%{version}.jar
install -m 644 %{name}-%{version}/mozilla/directory/java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}-%{version}.jar install -m 644 mozilla/directory/java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir} pushd $RPM_BUILD_ROOT%{_javadir}
for jar in *-%{version}.jar ; do for jar in *-%{version}.jar ; do
@ -92,7 +96,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
popd popd
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -r %{name}-%{version}/mozilla/directory/java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -r mozilla/directory/java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%if %{gcj_support} %if %{gcj_support}
%{_bindir}/aot-compile-rpm %{_bindir}/aot-compile-rpm
@ -138,6 +142,9 @@ fi
%{_javadocdir}/%{name}-%{version}/* %{_javadocdir}/%{name}-%{version}/*
%changelog %changelog
* Fri Mar 20 2009 Deepak Bhole <dbhole@redhat.com> - 0:4.18-4
- RPM was using pre-built jars before. Fixed that problem.
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-3 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild