rpms/guile/devel guile-1.8.6-deplibs.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 guile.spec, 1.60, 1.61 sources, 1.16, 1.17 guile-1.8.1-deplibs.patch, 1.1, NONE guile-1.8.5-conts.patch, 1.1, NONE guile-1.8.5-macrodir.patch, 1.1, NONE

Tue Dec 9 12:13:12 UTC 2008

Author: mlichvar

Update of /cvs/pkgs/rpms/guile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9245

Modified Files:
	.cvsignore guile.spec sources 
Added Files:
	guile-1.8.6-deplibs.patch 
Removed Files:
	guile-1.8.1-deplibs.patch guile-1.8.5-conts.patch 
	guile-1.8.5-macrodir.patch 
Log Message:
- update to 1.8.6


guile-1.8.6-deplibs.patch:

--- NEW FILE guile-1.8.6-deplibs.patch ---
diff -up guile-1.8.6/guile-config/guile-config.in.deplibs guile-1.8.6/guile-config/guile-config.in
--- guile-1.8.6/guile-config/guile-config.in.deplibs	2008-12-04 19:30:41.000000000 +0100
+++ guile-1.8.6/guile-config/guile-config.in	2008-12-09 12:17:48.000000000 +0100
@@ -152,10 +152,10 @@
 	      (list
 	       (get-build-info 'CFLAGS)
                (if (or (string=? libdir "/usr/lib")
-                       (string=? libdir "/usr/lib/"))
+                       (string=? libdir "/usr/lib64"))
 		   ""
 		   (string-append "-L" (get-build-info 'libdir)))
-               "-lguile -lltdl"
+               "-lguile"
 	       (string-join other-flags)
 
 	       )))
diff -up guile-1.8.6/libguile/Makefile.in.deplibs guile-1.8.6/libguile/Makefile.in
--- guile-1.8.6/libguile/Makefile.in.deplibs	2008-12-09 12:15:36.000000000 +0100
+++ guile-1.8.6/libguile/Makefile.in	2008-12-09 12:15:36.000000000 +0100
@@ -456,7 +456,7 @@ noinst_HEADERS = convert.i.c					\
 
 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
@@ -2026,8 +2026,8 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
 	@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
@@ -2048,7 +2048,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_
 	@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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	13 May 2008 11:47:06 -0000	1.16
+++ .cvsignore	9 Dec 2008 12:12:42 -0000	1.17
@@ -1 +1 @@
-guile-1.8.5.tar.gz
+guile-1.8.6.tar.gz


Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- guile.spec	19 Nov 2008 13:43:49 -0000	1.60
+++ guile.spec	9 Dec 2008 12:12:42 -0000	1.61
@@ -1,15 +1,13 @@
 Summary: A GNU implementation of Scheme for application extensibility
 Name: guile
 %define mver 1.8
-Version: 1.8.5
-Release: 2%{?dist}
+Version: 1.8.6
+Release: 1%{?dist}
 Source: ftp://ftp.gnu.org/pub/gnu/guile/guile-%{version}.tar.gz
 URL: http://www.gnu.org/software/guile/
 Patch1: guile-1.8.4-multilib.patch
 Patch2: guile-1.8.4-testsuite.patch
-Patch3: guile-1.8.5-conts.patch
-Patch4: guile-1.8.1-deplibs.patch
-Patch5: guile-1.8.5-macrodir.patch
+Patch4: guile-1.8.6-deplibs.patch
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -32,7 +30,7 @@
 %package devel
 Summary: Libraries and header files for the GUILE extensibility library
 Group: Development/Libraries
-Requires: guile = %{epoch}:%{version} gmp-devel
+Requires: guile = %{epoch}:%{version}-%{release} gmp-devel
 Requires: pkgconfig
 
 %description devel
@@ -47,13 +45,8 @@
 %prep
 %setup -q
 
-%patch5 -p1 -b .macrodir
-autoreconf -i -f
-sed -i '/define _GNU_SOURCE/d' config.h.in
-
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .testsuite
-%patch3 -p1 -b .conts
 %patch4 -p1 -b .deplibs
 
 %build
@@ -156,6 +149,7 @@
 %ghost %{_datadir}/guile/%{mver}/slib
 %dir %{_datadir}/guile/site
 %{_infodir}/*
+%{_mandir}/man1/guile.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -169,6 +163,9 @@
 %{_includedir}/libguile.h
 
 %changelog
+* Tue Dec 09 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.6-1
+- update to 1.8.6
+
 * Wed Nov 19 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.5-2
 - fix building with new libtool
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	13 May 2008 11:47:06 -0000	1.16
+++ sources	9 Dec 2008 12:12:42 -0000	1.17
@@ -1 +1 @@
-a3f8216544509a74a4441f689a0410d2  guile-1.8.5.tar.gz
+9e23d3dbea0e89bab8a9acc6880150de  guile-1.8.6.tar.gz


--- guile-1.8.1-deplibs.patch DELETED ---


--- guile-1.8.5-conts.patch DELETED ---


--- guile-1.8.5-macrodir.patch DELETED ---


