[bigloo: 1/2] new release 3.6a

[Gérard Milmeister]

commit b69049b3c20fe6e16216bc7573e71a0d901b94bc
Author: Gérard Milmeister <gemi at bluewin.ch>
Date:   Mon Feb 14 22:33:49 2011 +0100

    new release 3.6a

 .gitignore  |    1 +
 bigloo.spec |   45 ++++++++++++++++++++++++++++++++++-----------
 sources     |    2 +-
 3 files changed, 36 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70e52d8..6a94b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bigloo3.4a.tar.gz
+/bigloo3.6a.tar.gz
diff --git a/bigloo.spec b/bigloo.spec
index bf3f779..4e57ecd 100644
--- a/bigloo.spec
+++ b/bigloo.spec
@@ -16,7 +16,7 @@
 %global pkgname Bigloo
 
 Name:           bigloo
-Version:        3.4a
+Version:        3.6a
 Release:        1%{?patch_ver:.%{patch_ver}}%{?dist}
 Summary:        A compiler for the Scheme programming language
 
@@ -132,12 +132,23 @@ package to use %{pkgname} with XEmacs.
 
 %prep
 %setup -q -n %{name}%{version}%{?patch_suffix}
-sed -i 's|bmask=755|bmask=644|' configure
 # encoding fixes
 iconv -f ISO88591 -t UTF8 README -o README.utf8
 touch -r README README.utf8
 mv README.utf8 README
 
+# libraries need an SONAME of the form .so.0, not .so
+sed -i 's/sharedsuffix=so/sharedsuffix=so.0/g' configure
+mkdir -p lib/%{version}
+(cd lib/%{version}
+# need these links, so that the linker finds the libraries
+ln -sf libbigloo_u-%{version}.so.0 libbigloo_u-%{version}.so
+ln -sf libbigloo_s-%{version}.so.0 libbigloo_s-%{version}.so)
+
+# correct examples Makefiles for installation
+find examples -name Makefile -print0 | xargs -0 \
+     sed -i 's|include.*Makefile.config|include %{_libdir}/bigloo/%{version}/Makefile.config|g'
+
 
 %build
 %define inplace `pwd`/inplace
@@ -162,6 +173,7 @@ export CFLAGS
         --sharedbde=yes \
         --sharedcompiler=yes \
         --customgc=no \
+        --gclibdir=%{_libdir} \
         --coflags="$CFLAGS"
 
 # not needed anymore
@@ -192,19 +204,24 @@ make -C manuals DESTDIR=$RPM_BUILD_ROOT install-bee
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/*
 
 # move libraries to proper place
+# and rename them to conform to SONAME
 (
     cd $RPM_BUILD_ROOT%{_libdir}
-    chmod 755 bigloo/%{version}/*.so
-    rm -f *.so
-    mv bigloo/%{version}/*.so .
-    # seems to need to be hard linked so that it is provided by the package
-#    for ext in bdl calendar fth gstreamer mail multimedia pkgcomp pkglib pth sqlite ssl web
-#    do
-#        ln -f libbigloo${ext}_s-%{version}.so libbigloo${ext}_u-%{version}.so
-#    done
+    chmod 755 bigloo/%{version}/*.so.0
+    rm -f *.so.0
+    mv bigloo/%{version}/*.so.0 .
+    for f in *.so.0
+    do
+        mv $f ${f%%.so.0}.so.0.0.0
+        ln -sf ${f%%.so.0}.so.0.0.0 $f
+        ln -sf $f ${f%%.so.0}.so
+    done
     (cd bigloo/%{version}; ln -sf ../../*.so .)
 )
 
+sed -i 's|^BOOTBINDIR.*|BOOTBINDIR=%{_bindir}|g' $RPM_BUILD_ROOT%{_libdir}/bigloo/%{version}/Makefile.config
+sed -i 's|^BOOTLIBDIR.*|BOOTLIBDIR=%{_libdir}/bigloo/%{version}|g' $RPM_BUILD_ROOT%{_libdir}/bigloo/%{version}/Makefile.config
+
 rm -fr $RPM_BUILD_ROOT%{_infodir}/dir
 rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
 
@@ -225,6 +242,7 @@ EOF
   done
 )
 
+# xemacs (if wanted)
 %if 0%{?_with_xemacs}
 (
   cd bmacs
@@ -266,6 +284,7 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/bigloo
+%{_libdir}/lib*.so
 %{_infodir}/*
 %{_mandir}/man*/*
 %doc Makefile.config examples LICENSE COPYING
@@ -298,7 +317,7 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib*.so
+%{_libdir}/lib*.so.0*
 
 
 %files doc
@@ -307,6 +326,10 @@ fi
 
 
 %changelog
+* Sun Feb  6 2011 Gérard Milmeister <gemi at bluewin.ch> - 3.6a-1
+- Update to 3.6a
+- Tried to make shared libraries SONAME conformant
+
 * Fri Jul  2 2010 Michel Salim <salimma at fedoraproject.org> - 3.4a-1
 - Update to 3.4a
 
diff --git a/sources b/sources
index 659278e..904c6b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e625798c9eec2d7bb8377dfe33123d5  bigloo3.4a.tar.gz
+484c09cd0e0f84c96999d889de35cd1e  bigloo3.6a.tar.gz