SF.net SVN: gar:[24944] csw/mgar/pkg/lang-java/ldapjdk/trunk

[cgrzemba at users.sourceforge.net]

Revision: 24944
          http://sourceforge.net/p/gar/code/24944
Author:   cgrzemba
Date:     2015-05-06 14:55:54 +0000 (Wed, 06 May 2015)
Log Message:
-----------
lang-java/ldapjdk/trunk: update 4.18

Modified Paths:
--------------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
    csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch

Modified: csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2015-05-06 13:39:49 UTC (rev 24943)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/Makefile	2015-05-06 14:55:54 UTC (rev 24944)
@@ -1,10 +1,10 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = ldapsdk_java
-VERSION = 20020819
+NAME = ldapjdk
+VERSION = 4.18
 GARTYPE = v2
-CATEGORIES = java
+# CATEGORIES = java
 
 DESCRIPTION = Mozilla LDAP SDK for Java
 define BLURB
@@ -14,8 +14,10 @@
 endef
 
 # MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/directory/java-sdk
-MASTER_SITES = http://www-archive.mozilla.org/directory
-DISTFILES  = $(NAME)_$(VERSION).tar.gz
+# MASTER_SITES = http://www-archive.mozilla.org/directory/
+MASTER_SITES = http://pki.fedoraproject.org/pki/sources/ldapjdk/
+DISTNAME = $(NAME)-$(VERSION)
+# DISTFILES  = $(NAME)-$(VERSION).tar.gz
 DISTFILES += COPYING
 
 PACKAGES = CSWldapjdk
@@ -32,8 +34,10 @@
 LICENSE = COPYING
 # LICENSE = $(WORKDIR)/$(DISTDIR)/relnotes.htm
 
-JAVA_HOME = /usr/j2sdk1.4.2_17
+PATCHFILES += 0001-matching-rule-parsing.patch
 
+# JAVA_HOME = /usr/j2sdk1.4.2_17
+
 CONFIGURE_SCRIPTS =
 BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
@@ -43,11 +47,12 @@
 
 install-custom: 
 	@ginstall -d $(DESTDIR)$(datadir)/java
-	@gcp -fp $(WORKSRC)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
+	@gcp -fp $(WORKSRC)/$(DISTNAME)/$(DISTDIR)/dist/packages/$(CATALOGNAME_CSWldapjdk).jar $(DESTDIR)$(datadir)/java
 	@$(MAKECOOKIE)
 
 build-custom:
-	@( cd $(WORKSRC)/$(DISTDIR); \
-	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.4 ; \
+	@( cd $(WORKSRC)/$(DISTNAME)/$(DISTDIR); \
+	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk MOZ_SRC=. JAVA_VERSION=1.7 ; \
 	  JAVA_HOME=$(JAVA_HOME) gmake -f ldap.mk basepackage )
 	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums	2015-05-06 13:39:49 UTC (rev 24943)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/checksums	2015-05-06 14:55:54 UTC (rev 24944)
@@ -1 +1 @@
-f0eef8fc5c4961cdebdd9b9188228431  ldapsdk_java_20020819.tar.gz
+5c37162e72acba3a224c5f3e434c7bdc  ldapjdk-4.18.tar.gz

Added: csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch
===================================================================
--- csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch	                        (rev 0)
+++ csw/mgar/pkg/lang-java/ldapjdk/trunk/files/0001-matching-rule-parsing.patch	2015-05-06 14:55:54 UTC (rev 24944)
@@ -0,0 +1,13 @@
+--- ./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];
+             }
+         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.