rpms/guile/devel guile-1.8.5-macrodir.patch, NONE, 1.1 guile.spec, 1.59, 1.60

[Miroslav Lichvar]

Author: mlichvar

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

Modified Files:
	guile.spec 
Added Files:
	guile-1.8.5-macrodir.patch 
Log Message:
- fix building with new libtool


guile-1.8.5-macrodir.patch:

--- NEW FILE guile-1.8.5-macrodir.patch ---
diff -up guile-1.8.5/configure.in.macrodir guile-1.8.5/configure.in
--- guile-1.8.5/configure.in.macrodir	2008-05-07 19:51:15.000000000 +0200
+++ guile-1.8.5/configure.in	2008-11-19 13:58:34.000000000 +0100
@@ -38,7 +38,7 @@ AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VE
 ]),
         [bug-guile at gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIR([guile-config])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
 
 AM_INIT_AUTOMAKE([gnu no-define check-news])


Index: guile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guile/devel/guile.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- guile.spec	13 May 2008 11:47:06 -0000	1.59
+++ guile.spec	19 Nov 2008 13:43:49 -0000	1.60
@@ -2,17 +2,19 @@
 Name: guile
 %define mver 1.8
 Version: 1.8.5
-Release: 1%{?dist}
+Release: 2%{?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
 License: GPLv2+ and LGPLv2+
 Group: Development/Languages
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool libtool-ltdl-devel gmp-devel readline-devel
+Buildrequires: gettext-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: coreutils
@@ -44,6 +46,11 @@
 
 %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
@@ -162,6 +169,9 @@
 %{_includedir}/libguile.h
 
 %changelog
+* Wed Nov 19 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.5-2
+- fix building with new libtool
+
 * Tue May 13 2008 Miroslav Lichvar <mlichvar at redhat.com> - 5:1.8.5-1
 - update to 1.8.5
 - fix continuations on ia64