commit 759acba0143ccc2f455ffd2654ffcb294a171138
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Thu Mar 31 15:51:44 2011 -0600
Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values
Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values
upstream bug
https://bugzilla.mozilla.org/show_bug.cgi?id=640750
ldapjdk.spec | 8 +++++++-
matching-rule-parsing-640750.patch | 14 ++++++++++++++
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/ldapjdk.spec b/ldapjdk.spec
index e9bd59e..d2ed8c3 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -4,7 +4,7 @@
Name: ldapjdk
Version: 4.18
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: The Mozilla LDAP Java SDK
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -15,6 +15,7 @@ URL:
http://www.mozilla.org/directory/javasdk.html
# tar -zcf ldapjdk-4.18,tar.gz ldapjdk-4.18
Source: %{name}-%{version}.tar.gz
Patch0: %{name}-jarnamefix.patch
+Patch1: matching-rule-parsing-640750.patch
Requires: jpackage-utils >= 0:1.5
Requires: jss
@@ -43,6 +44,7 @@ Javadoc for %{name}
rm -f ./mozilla/directory/java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
%patch0 -p1
+%patch1 -p1
%build
# cleanup CVS dirs
@@ -86,6 +88,10 @@ cp -r mozilla/directory/java-sdk/dist/doc/*
$RPM_BUILD_ROOT%{_javadocdir}/%{name
%{_javadocdir}/%{name}/*
%changelog
+* Thu Mar 31 2011 Rich Megginson <rmeggins(a)redhat.com> 0:4.18-8
+- Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values
+- upstream bug
https://bugzilla.mozilla.org/show_bug.cgi?id=640750
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:4.18-7
- Drop gcj.
- Adapt to current guidelines.
diff --git a/matching-rule-parsing-640750.patch b/matching-rule-parsing-640750.patch
new file mode 100644
index 0000000..dfa50ac
--- /dev/null
+++ b/matching-rule-parsing-640750.patch
@@ -0,0 +1,14 @@
+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];
+ }
+ }