From 44483c96b9a22092001f1b4b49b144f259c3c82b Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Fri, 13 Oct 2006 10:43:11 +0000
Subject: - update to 1.8.1

---
 .cvsignore                |  3 +--
 guile-1.8.1-deplibs.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 guile.spec                | 15 ++++++++-------
 sources                   |  3 +--
 4 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 guile-1.8.1-deplibs.patch

diff --git a/.cvsignore b/.cvsignore
index f8cefc6..62c1539 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-guile-1.8.0.tar.gz
-guile-1.8.0-20060831cvs.patch.gz
+guile-1.8.1.tar.gz
diff --git a/guile-1.8.1-deplibs.patch b/guile-1.8.1-deplibs.patch
new file mode 100644
index 0000000..4efe565
--- /dev/null
+++ b/guile-1.8.1-deplibs.patch
@@ -0,0 +1,45 @@
+--- guile-1.8.1/libguile/Makefile.in.deplibs	2006-10-07 05:54:33.000000000 +0200
++++ guile-1.8.1/libguile/Makefile.in	2006-10-09 10:54:38.000000000 +0200
+@@ -441,7 +441,7 @@
+ 
+ libguile_la_DEPENDENCIES = @LIBLOBJS@
+ libguile_la_LIBADD = @LIBLOBJS@
+-libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
++libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined -pthread
+ 
+ # These are headers visible as <guile/mumble.h>
+ pkginclude_HEADERS = gh.h
+@@ -1908,8 +1908,8 @@
+ 	@echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
+ 	@echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
+ 	@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
+-	@echo '	{ "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
+-	@echo ' { "top_srcdir",    "@top_srcdir_absolute@" }, \' >> libpath.tmp
++	@echo '	{ "srcdir", "" }, \' >> libpath.tmp
++	@echo ' { "top_srcdir",    "" }, \' >> libpath.tmp
+ 	@echo '	{ "prefix",	   "@prefix@" }, \' >> libpath.tmp
+ 	@echo '	{ "exec_prefix",   "@exec_prefix@" }, \' >> libpath.tmp
+ 	@echo '	{ "bindir",	   "@bindir@" }, \' >> libpath.tmp
+@@ -1930,7 +1930,7 @@
+ 	@echo '	{ "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp
+ 	@echo '	{ "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
+ 		>> libpath.tmp
+-	@echo '	{ "LIBS",	   "@GUILE_LIBS@" }, \' >> libpath.tmp
++	@echo '	{ "LIBS",	   "" }, \' >> libpath.tmp
+ 	@echo '	{ "CFLAGS",	   "@GUILE_CFLAGS@" }, \' >> libpath.tmp
+ 	@echo '	{ "buildstamp",    "'"`date`"'" }, \' >> libpath.tmp
+ 	@echo '}' >> libpath.tmp
+--- guile-1.8.1/guile-config/guile-config.in.deplibs	2006-09-20 02:19:02.000000000 +0200
++++ guile-1.8.1/guile-config/guile-config.in	2006-10-09 11:00:02.000000000 +0200
+@@ -151,9 +151,9 @@
+     (display (string-join
+ 	      (list
+ 	       (get-build-info 'CFLAGS)
+-	       "-lguile -lltdl" 
++	       "-lguile" 
+                (if (or (string=? libdir "/usr/lib")
+-                       (string=? libdir "/usr/lib/"))
++                       (string=? libdir "/usr/lib64"))
+ 		   ""
+ 		   (string-append "-L" (get-build-info 'libdir)))
+ 	       (string-join other-flags)
diff --git a/guile.spec b/guile.spec
index 5e6d23c..8894e35 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,13 +1,12 @@
 Summary: A GNU implementation of Scheme for application extensibility.
 Name: guile
-Version: 1.8.0
-Release: 8.20060831cvs
+Version: 1.8.1
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
-Patch0: guile-1.8.0-20060831cvs.patch.gz
 Patch1: guile-1.8.0-rpath.patch
 Patch2: guile-1.8.0-slib.patch
-Patch4: guile-1.8.0-deplibs.patch
+Patch4: guile-1.8.1-deplibs.patch
 Patch5: guile-1.8.0-multilib.patch
 License: GPL
 Group: Development/Languages
@@ -43,8 +42,7 @@ install the guile package.
 
 %prep
 %setup -q
-%patch0 -p1
-#%patch1 -p1 -b .rpath
+%patch1 -p1 -b .rpath
 %patch2 -p1 -b .slib
 %patch4 -p1 -b .deplibs
 %patch5 -p1 -b .multilib
@@ -58,7 +56,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/guile/site
 
@@ -121,6 +119,9 @@ fi
 %{_includedir}/libguile.h
 
 %changelog
+* Fri Oct 13 2006 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.1-1
+- update to 1.8.1
+
 * Tue Sep 05 2006 Miroslav Lichvar <mlichvar@redhat.com> - 5:1.8.0-8.20060831cvs
 - make triggerin scriptlet a bit safer
 
diff --git a/sources b/sources
index ef34a2b..25e9bde 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3f47443602f93e94bf43218d9b86099d  guile-1.8.0.tar.gz
-c9e25a81326dfcfc170193a0f852e02c  guile-1.8.0-20060831cvs.patch.gz
+be792074780d597208a8cdfed976f559  guile-1.8.1.tar.gz
-- 
cgit