rpms/ldapjdk/devel ldapjdk-jarnamefix.patch, NONE, 1.1 ldapjdk.spec, 1.16, 1.17

[Deepak Bhole]

Author: dbhole

Update of /cvs/pkgs/rpms/ldapjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31771

Modified Files:
	ldapjdk.spec 
Added Files:
	ldapjdk-jarnamefix.patch 
Log Message:

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



ldapjdk-jarnamefix.patch:

--- NEW FILE ldapjdk-jarnamefix.patch ---
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 -->


Index: ldapjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ldapjdk/devel/ldapjdk.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ldapjdk.spec	25 Feb 2009 12:48:10 -0000	1.16
+++ ldapjdk.spec	20 Mar 2009 20:56:37 -0000	1.17
@@ -9,7 +9,7 @@
 
 Name:		ldapjdk
 Version:	4.18
-Release:	3%{?dist}
+Release:	4%{?dist}
 Epoch:		0
 Summary: 	The Mozilla LDAP Java SDK
 License:	MPLv1.1 or GPLv2+ or LGPLv2+
@@ -19,6 +19,7 @@
 # cvs -d:pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot Export -r LDAPJavaSDK_418 DirectorySDKSourceJava
 # tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18
 Source:		%{name}-%{version}.tar.gz
+Patch0: 	%{name}-jarnamefix.patch
 
 Requires:	jaas
 Requires:	jndi
@@ -57,27 +58,30 @@
 Javadoc for %{name}
 
 %prep
-%setup -q -c
+%setup -q
 # 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
 
+%patch0 -p1
+
 %build
 # cleanup CVS dirs
 rm -fr $(find . -name CVS -type d)
 # Link to build-system BRs
-( cd  mozilla/directory/java-sdk/ldapjdk/lib && build-jar-repository . jss4 jsse jaas jndi )
-cd %{name}-%{version}/mozilla/directory/java-sdk
+pwd
+( 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
-sh -x ant -d dist
+sh -x ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 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 %{name}-%{version}/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 %{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/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}-%{version}.jar
+install -m 644 mozilla/directory/java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}-%{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}
 	for jar in *-%{version}.jar ; do
@@ -92,7 +96,7 @@
 popd
 
 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}
 %{_bindir}/aot-compile-rpm
@@ -138,6 +142,9 @@
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Fri Mar 20 2009 Deepak Bhole <dbhole at 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 at lists.fedoraproject.org> - 0:4.18-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild