SPECS: ldapsdk.spec - now builds with jdk 1.5

[qboosh]

Author: qboosh                       Date: Thu Nov 16 14:43:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- now builds with jdk 1.5

---- Files affected:
SPECS:
   ldapsdk.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/ldapsdk.spec
diff -u SPECS/ldapsdk.spec:1.4 SPECS/ldapsdk.spec:1.5
--- SPECS/ldapsdk.spec:1.4	Thu May 11 18:54:46 2006
+++ SPECS/ldapsdk.spec	Thu Nov 16 15:43:20 2006
@@ -9,6 +9,10 @@
 Source0:	http://www.mozilla.org/directory/ldapsdk_java_20020819.tar.gz
 # Source0-md5:	f0eef8fc5c4961cdebdd9b9188228431
 URL:		http://www.mozilla.org/directory/
+BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+BuildRequires:	sed >= 4.0
+Requires:	jre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,14 +36,18 @@
 Dokumentacja javadoc dla LDAP SDK.
 
 %prep
-%setup -q -n mozilla
+%setup -q -c
 # remove CVS control files
 find -name CVS -print0 | xargs -0 rm -rf
 
+sed -i -e 's/ -classpath / -source 1.4 -classpath /' mozilla/directory/java-sdk/ldap.mk
+
 %build
-cd directory/java-sdk
+cd mozilla/directory/java-sdk
 %{__make} -f ldap.mk \
+	%{!?debug:DEBUG=0} \
 	MOZ_SRC=. \
+	JAVA_HOME="%{java_home}" \
 	JAVA_VERSION=1.4
 
 %{__make} -f ldap.mk basepackage
@@ -48,18 +56,18 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install directory/java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}
+install mozilla/directory/java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}
 
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -r 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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc directory/java-sdk/{ldapsp-relnotes.htm,relnotes.htm}
-%{_javadir}/*
+%doc mozilla/directory/java-sdk/{ldapsp-relnotes.htm,relnotes.htm}
+%{_javadir}/ldapjdk.jar
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -71,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/11/16 14:43:20  qboosh
+- now builds with jdk 1.5
+
 Revision 1.4  2006/05/11 16:54:46  qboosh
 - pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ldapsdk.spec?r1=1.4&r2=1.5&f=u