[bigloo] Update to 3.8a-2. Drop upstreamed java SSL patch. Create (X)Emacs install dirs to avoid occasional b
Jerry James
jjames at fedoraproject.org
Tue May 1 18:45:40 UTC 2012
commit 875d6e67064d38f0f6dc7a6b351f582ea7446a67
Author: Jerry James <loganjerry at gmail.com>
Date: Tue May 1 12:45:17 2012 -0600
Update to 3.8a-2.
Drop upstreamed java SSL patch.
Create (X)Emacs install dirs to avoid occasional build failure.
.gitignore | 2 +-
bigloo-java-ssl.patch | 23 -------------
bigloo-jdk17.patch | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
bigloo.spec | 21 +++++++++---
sources | 2 +-
5 files changed, 101 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2b1ac6..de198c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bigloo3.8a.tar.gz
+/bigloo3.8a-2.tar.gz
diff --git a/bigloo-jdk17.patch b/bigloo-jdk17.patch
new file mode 100644
index 0000000..887ecf9
--- /dev/null
+++ b/bigloo-jdk17.patch
@@ -0,0 +1,84 @@
+--- ./configure.orig 2012-03-30 09:56:54.487360443 -0600
++++ ./configure 2012-03-30 10:14:48.540868578 -0600
+@@ -2536,7 +2536,9 @@ if [ $action = "all" -o $action = "biglo
+ fi
+
+ java_version=`$javac -version 2>&1 | head -n 1` || exit 1
+- if echo "$java_version" | grep "1.6" > /dev/null
++ if echo "$java_version" | grep "1.7" > /dev/null
++ then java_version=1.7
++ elif echo "$java_version" | grep "1.6" > /dev/null
+ then java_version=1.6
+ elif echo "$java_version" | grep "1.5" > /dev/null
+ then java_version=1.5
+--- ./api/ssl/src/Makefile.orig 2012-03-29 06:05:57.000000000 -0600
++++ ./api/ssl/src/Makefile 2012-03-30 10:21:26.276352134 -0600
+@@ -84,11 +84,15 @@ INCLUDES = $(C_SRC_DIR)/bglssl.h
+ #*---------------------------------------------------------------------*/
+ #* Java objects */
+ #*---------------------------------------------------------------------*/
+-ifeq ($(JAVA_VERSION), 1.6)
++ifeq ($(JAVA_VERSION), 1.7)
+ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
+ else
+- ifeq ($(JAVA_VERSION), 1.5)
+- JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++ ifeq ($(JAVA_VERSION), 1.6)
++ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++ else
++ ifeq ($(JAVA_VERSION), 1.5)
++ JAVA_CLASSES_SRC+=$(CLASS_DIR)/certificate.java $(CLASS_DIR)/private_key.java
++ endif
+ endif
+ endif
+
+@@ -149,13 +153,17 @@ jvm-extra: $(JAVA_CLASSES_SRC) $(BOOTLIB
+ #*---------------------------------------------------------------------*/
+ #* Java auconfiguration */
+ #*---------------------------------------------------------------------*/
+-ifeq ($(JAVA_VERSION), 1.6)
++ifeq ($(JAVA_VERSION), 1.7)
+ JDK=15
++else
++ ifeq ($(JAVA_VERSION), 1.6)
++ JDK=15
+ else
+ ifeq ($(JAVA_VERSION), 1.5)
+ JDK=15
+ else
+ JDK=13
++ endif
+ endif
+ endif
+
+--- ./runtime/Makefile.orig 2012-03-29 06:05:57.000000000 -0600
++++ ./runtime/Makefile 2012-03-30 10:23:07.243877890 -0600
+@@ -109,16 +109,20 @@ C_CLIB = $(CLIB:%=Clib/%.c)
+ #* Java objects */
+ #*---------------------------------------------------------------------*/
+ JDK_LIBS = JDK
+-ifeq ($(JAVA_VERSION), 1.6)
++ifeq ($(JAVA_VERSION), 1.7)
+ JDK_LIBS += JDK16
+- else
+- ifeq ($(JAVA_VERSION), 1.5)
+- JDK_LIBS += JDK15
+- else
+- ifeq ($(JAVA_VERSION), 1.4)
+- JDK_LIBS += JDK14
++else
++ ifeq ($(JAVA_VERSION), 1.6)
++ JDK_LIBS += JDK16
+ else
+- JDK_LIBS += JDK13
++ ifeq ($(JAVA_VERSION), 1.5)
++ JDK_LIBS += JDK15
++ else
++ ifeq ($(JAVA_VERSION), 1.4)
++ JDK_LIBS += JDK14
++ else
++ JDK_LIBS += JDK13
++ endif
+ endif
+ endif
+ endif
diff --git a/bigloo.spec b/bigloo.spec
index aa5b4a0..11ef596 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -3,8 +3,8 @@
# patch_suffix is defined to be empty when patch_ver is not defined,
# so that when updating, the Source and %%setup lines do not have to be
# changed, only the Version and patch_ver
-#global patch_ver 5
-#global patch_suffix %%{?patch_ver:-%%{patch_ver}}
+%global patch_ver 2
+%global patch_suffix %%{?patch_ver:-%%{patch_ver}}
# For Emacs subpackages
%global pkg %{name}
@@ -22,8 +22,9 @@ 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
+# Sent upstream 30 Mar 2012. Some code is conditional on JVM version, but
+# doesn't know about JDK 1.7.
+Patch1: bigloo-jdk17.patch
BuildRequires: emacs
BuildRequires: xemacs
@@ -128,7 +129,8 @@ package to use %{pkgname} with XEmacs.
%prep
-%setup -q -n %{name}%{version}%{?patch_suffix}
+#%%setup -q -n %%{name}%%{version}%%{?patch_suffix}
+%setup -q -n %{name}%{version}
%patch0
%patch1
@@ -172,7 +174,7 @@ sed -i -e "s/^jcflags=-O$/jcflags=-deprecation/" configure
--docdir=%{_docdir} \
--lispdir=%{_emacs_sitelispdir}/bigloo \
--jvm=yes \
- --javac=javac \
+ --javaprefix=%{_jvmdir}/java/bin \
--bee=full \
--customgc=no \
--coflags="$CFLAGS" \
@@ -197,6 +199,8 @@ env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
%install
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/bigloo
+mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/bigloo
env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
make DESTDIR=$RPM_BUILD_ROOT INSTALL="cp -a" install
env LD_LIBRARY_PATH=`pwd`/lib/%{version} \
@@ -319,6 +323,11 @@ make test
%changelog
+* Fri Mar 30 2012 Jerry James <loganjerry at gmail.com> - 3.8a-1.2
+- Update to 3.8a-2
+- Drop upstreamed java SSL patch
+- Create (X)Emacs install dirs to avoid occasional build failure
+
* Fri Mar 23 2012 Jerry James <loganjerry at gamil.com> - 3.8a-1
- Update to 3.8a
- Drop upstreamed patches
diff --git a/sources b/sources
index 3d2271e..cd6c0b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ca6db718e759c1240ae01f41d321c91 bigloo3.8a.tar.gz
+2023ad124676f3a7f30690d635f98075 bigloo3.8a-2.tar.gz
More information about the scm-commits
mailing list