[bigloo] Apply upstream fix for the Java SSL interface.

Jerry James jjames at fedoraproject.org
Mon Mar 26 15:36:33 UTC 2012


commit 1dd30f9b025b8e08e1f63ac08192416a61281a80
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Mar 26 09:36:16 2012 -0600

    Apply upstream fix for the Java SSL interface.

 bigloo-java-ssl.patch |   23 +++++++++++++++++++++++
 bigloo.spec           |    3 +++
 2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/bigloo-java-ssl.patch b/bigloo-java-ssl.patch
new file mode 100644
index 0000000..797da49
--- /dev/null
+++ b/bigloo-java-ssl.patch
@@ -0,0 +1,23 @@
+--- ./api/ssl/src/Makefile.orig	2012-03-23 01:46:50.000000000 -0600
++++ ./api/ssl/src/Makefile	2012-03-26 09:32:39.128515239 -0600
+@@ -66,7 +66,8 @@ BGL_ECLASSES	= $(CLASS_EDIR)/make_lib.cl
+ 
+ JAVA_CLASSES	= $(_JAVA_CLASSES:%=$(CLASS_DIR)/%.class) \
+                   $(_JAVA_ECLASSES:%=$(CLASS_DIR)/%.class)
+-JAVA_CLASSES_SRC= $(_JAVA_CLASSES:%=$(CLASS_DIR)/%.java)
++JAVA_CLASSES_SRC= $(_JAVA_CLASSES:%=$(CLASS_DIR)/%.java) \
++                  $(_JAVA_ECLASSES:%=$(CLASS_DIR)/%.java)
+ 
+ _WIN32_SRC	= 
+ 
+--- ./api/ssl/src/Misc/ssl.init.in.orig	2012-03-23 01:46:50.000000000 -0600
++++ ./api/ssl/src/Misc/ssl.init.in	2012-03-26 09:33:25.208479200 -0600
+@@ -29,7 +29,7 @@
+ 	  (cons "openssl/ssl.h" *additional-include-foreign*))
+     (set! *ld-post-options* 
+ 	  (string-append "@OPENSSLLIBS@ " *ld-post-options*))
+-    (set! *additional-bigloo-zips* (cons "commons-ssl.jar" *additional-bigloo-zips*)))
++    (set! *additional-bigloo-zips* (cons "commons-ssl.zip" *additional-bigloo-zips*)))
+    (bigloo-eval
+     #unspecified))
+ 
diff --git a/bigloo.spec b/bigloo.spec
index 0f19f2a..aa5b4a0 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -22,6 +22,8 @@ Source0:        ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo%{version}%{?patch_
 # Not yet sent upstream: fix some bugs in the Emacs interface, and also
 # modernizes the code somewhat.
 Patch0:         bigloo-emacs.patch
+# Applied upstream: fix the Java SSL interface
+Patch1:         bigloo-java-ssl.patch
 
 BuildRequires:  emacs
 BuildRequires:  xemacs
@@ -128,6 +130,7 @@ package to use %{pkgname} with XEmacs.
 %prep
 %setup -q -n %{name}%{version}%{?patch_suffix}
 %patch0
+%patch1
 
 # encoding fixes
 for f in README examples/Socket/socket.scm manuals/bigloo.info-2 \


More information about the scm-commits mailing list