Sync with RHAPS
This commit is contained in:
parent
a5dfc68943
commit
e120d1f15c
@ -1 +1,2 @@
|
|||||||
ldapsdk_java_20000505.tar.gz
|
jss34.jar
|
||||||
|
ldapsdk_java_20020819.tar.gz
|
||||||
|
29
ldapjdk.spec
29
ldapjdk.spec
@ -1,9 +1,9 @@
|
|||||||
%define name ldapjdk
|
%define name ldapjdk
|
||||||
%define spname ldapsp
|
%define spname ldapsp
|
||||||
%define version 4.1
|
%define version 4.17
|
||||||
%define tar_name ldapsdk_java
|
%define tar_name ldapsdk_java
|
||||||
%define tar_version 20000505
|
%define tar_version 20020819
|
||||||
%define release 5jpp_1rh
|
%define release 1jpp_1rh
|
||||||
%define section free
|
%define section free
|
||||||
|
|
||||||
Name: %{name}
|
Name: %{name}
|
||||||
@ -15,9 +15,10 @@ License: MPL
|
|||||||
Group: Development/Java
|
Group: Development/Java
|
||||||
URL: http://www.mozilla.org/directory/javasdk.html
|
URL: http://www.mozilla.org/directory/javasdk.html
|
||||||
Source0: ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}.tar.gz
|
Source0: ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}.tar.gz
|
||||||
#based on the http://bugzilla.mozilla.org/show_bug.cgi?id=55984 zip
|
# FIXME: A jpackage must be created for the
|
||||||
Patch0: %{name}-%{version}-DSMLWriter.patch
|
# Mozilla Network Security Services for Java (JSS)
|
||||||
Patch1: ldapjdk-javaxssl.patch
|
Source2: jss34.jar
|
||||||
|
|
||||||
Requires: oro
|
Requires: oro
|
||||||
Requires: jaas
|
Requires: jaas
|
||||||
Requires: jndi
|
Requires: jndi
|
||||||
@ -49,9 +50,6 @@ Javadoc for %{name}
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -c
|
%setup -q -c
|
||||||
|
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p0
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# cleanup CVS dirs
|
# cleanup CVS dirs
|
||||||
rm -fr $(find . -name CVS -type d)
|
rm -fr $(find . -name CVS -type d)
|
||||||
@ -63,7 +61,11 @@ rm -fr mozilla
|
|||||||
cd java-sdk
|
cd java-sdk
|
||||||
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
|
if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
|
||||||
|
|
||||||
export CLASSPATH=$(build-classpath oro jndi jaas jsse)
|
# FIXME: A jpackage must be created for this
|
||||||
|
cp %{SOURCE2} .
|
||||||
|
export CLASSPATH=`pwd`/jss34.jar:%(build-classpath oro jndi jaas jsse)
|
||||||
|
export MOZ_SRC=`pwd`
|
||||||
|
export JAVA_VERSION=1.4
|
||||||
|
|
||||||
# Main jar
|
# Main jar
|
||||||
%__make -f ldap.mk clean
|
%__make -f ldap.mk clean
|
||||||
@ -115,6 +117,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_javadocdir}/%{name}-%{version}/*
|
%{_javadocdir}/%{name}-%{version}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 16 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp_1rh
|
||||||
|
- Merge with upstream for upgrade
|
||||||
|
|
||||||
|
* Thu Aug 26 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp
|
||||||
|
- Upgrade to 4.17
|
||||||
|
- Rebuilt with Ant 1.6.2
|
||||||
|
|
||||||
* Fri Mar 5 2004 Frank Ch. Eigler <fche@redhat.com> 0:4.1-5jpp_1rh
|
* Fri Mar 5 2004 Frank Ch. Eigler <fche@redhat.com> 0:4.1-5jpp_1rh
|
||||||
- RH vacuuming
|
- RH vacuuming
|
||||||
- added ldapjdk-javaxssl.patch to stop using com.sun.*
|
- added ldapjdk-javaxssl.patch to stop using com.sun.*
|
||||||
|
Loading…
Reference in New Issue
Block a user