Hello community, here is the log from the commit of package ldapjdk for openSUSE:Factory checked in at 2013-07-19 17:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldapjdk (Old) and /work/SRC/openSUSE:Factory/.ldapjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ldapjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/ldapjdk/ldapjdk.changes 2011-09-23 02:07:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ldapjdk.new/ldapjdk.changes 2013-07-19 17:17:45.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Jul 14 14:06:04 UTC 2013 - [email protected] + +- Re-include jss.jar (jss4.jar, former was jss34.jar), to again fix + build on openSUSE < 13.1 + +------------------------------------------------------------------- +Thu Jul 11 10:49:06 UTC 2013 - [email protected] + +- ldapjdk is now maintained by Fedora Project, not mozilla +- New upstream version 4.18 +- No more CVS dirs to remove +- Build with mozilla-jss +- Clean up spec file, %fdupes on javadoc + +------------------------------------------------------------------- Old: ---- jss34.jar ldapsdk_java_20020819.tar.gz New: ---- jss4.jar ldapjdk-4.18.tar.gz ldapjdk-jarnamefix.patch matching-rule-parsing-640750.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldapjdk.spec ++++++ --- /var/tmp/diff_new_pack.fdwsrj/_old 2013-07-19 17:17:46.000000000 +0200 +++ /var/tmp/diff_new_pack.fdwsrj/_new 2013-07-19 17:17:46.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ldapjdk (Version 4.17) +# spec file for package ldapjdk # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,49 +15,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ldapjdk -BuildRequires: java2-devel-packages oro xerces-j2 -%define name ldapjdk %define spname ldapsp -%define version 4.17 -%define tar_name ldapsdk_java -%define tar_version 20020819 -%define release 1jpp -%define section free -Version: 4.17 -Release: 270 +Version: 4.18 +Release: 0 Summary: The Mozilla LDAP Java SDK -License: MPL-1.1 +License: MPL-1.1 and GPL-2.0 and LGPL-2.1 Group: Development/Libraries/Java Url: http://www.mozilla.org/directory/javasdk.html -Source0: ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}.tar.gz -# FIXME: A jpackage must be created for the +Source0: http://pki.fedoraproject.org/pki/sources/ldapjdk/%{name}-%{version}.tar.gz +# mozilla-jss not available on openSUSE < 13.1, so we still require jss*.jar for build # Mozilla Network Security Services for Java (JSS) -Source2: jss34.jar -Patch: ldap-javasource14.patch -Requires: oro +Source1: jss4.jar +Patch1: ldap-javasource14.patch +Patch2: ldapjdk-jarnamefix.patch +Patch3: matching-rule-parsing-640750.patch +BuildArch: noarch +%if 0%{?suse_version} >= 1100 +BuildRequires: fdupes +%endif +BuildRequires: java2-devel-packages +%if 0%{?suse_version} >= 1310 +BuildRequires: mozilla-jss +%endif +BuildRequires: oro +BuildRequires: xerces-j2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build + Requires: jaas Requires: jndi Requires: jpackage-utils >= 1.5 Requires: jsse +Requires: oro # Provides: jndi-ldap = 1.3.0 -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Mozilla LDAP SDKs enable you to write applications that access, manage, and update the information stored in an LDAP directory. - %package javadoc -License: MPL-1.1 PreReq: coreutils -Group: Development/Libraries/Java Summary: Javadoc for ldapjdk +Group: Development/Libraries/Java Obsoletes: openjmx-javadoc %description javadoc @@ -68,23 +69,26 @@ SDKs. - %prep -%setup -q -c -%patch +%setup -q +%patch1 +%patch2 +%patch3 %build -# cleanup CVS dirs -rm -fr $(find . -name CVS -type d) # cleanup jars rm -fr $(find . -name "*.jar" -type f) mv mozilla/directory/* . rm -fr mozilla cd java-sdk if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi -# FIXME: A jpackage must be created for this -cp %{SOURCE2} . -export CLASSPATH=`pwd`/jss34.jar:%(build-classpath oro) +%if %{?suse_version} >= 1310 +export CLASSPATH=%{_jnidir}/jss4.jar:%(build-classpath oro) +%else +# mozilla-jss not available on openSUSE < 13.1, so we still require the .jar for build +cp %{SOURCE1} . +export CLASSPATH=`pwd`/jss4.jar:%(build-classpath oro) +%endif export MOZ_SRC=`pwd` export JAVA_VERSION=1.4 # Main jar @@ -99,31 +103,32 @@ %__make -f ldapsp.mk doc %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir} +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 java-sdk/dist/packages/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +install -m 644 java-sdk/dist/packages/%{spname}.jar %{buildroot}%{_javadir}/%{spname}-%{version}.jar +pushd %{buildroot}%{_javadir} for jar in *-%{version}.jar ; do ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|.jar|g") done popd -# install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0 +# install -d -m 755 %%{buildroot}%%{_javadir}-1.3.0 # -# pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 -# ln -fs ../java/*%{spname}.jar jndi-ldap.jar +# pushd %%{buildroot}%%{_javadir}-1.3.0 +# ln -fs ../java/*%%name}.jar jndi-ldap.jar # popd -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp -r java-sdk/dist/doc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%clean -rm -rf $RPM_BUILD_ROOT +%if 0%{?suse_version} >= 1100 +%fdupes %{buildroot}/%{_javadocdir}/%{name}-%{version} +%endif %files %defattr(0644,root,root,0755) %doc buildjsdk.txt java-sdk/*.htm %{_javadir}/%{name}*.jar %{_javadir}/%{spname}*.jar -# %{_javadir}-1.3.0/*.jar +# %%{_javadir}-1.3.0/*.jar %files javadoc %defattr(0644,root,root,0755) ++++++ 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 --> ++++++ matching-rule-parsing-640750.patch ++++++ diff -r 45450e5b01df java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java --- ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java Fri Feb 18 09:02:26 2011 -0700 +++ ./mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPSchemaElement.java Thu Mar 10 13:51:04 2011 -0800 @@ -544,6 +544,10 @@ for( int i = 0; i < names.length; i++ ) { String[] vals = getQualifier( names[i] ); if ( (vals != null) && (vals.length > 0) ) { + // need a space between elements + if (i > 0) { + s += ' '; + } s += names[i] + ' ' + vals[0]; } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
