[packages/guile1: 86/172] - 1.6.1 - updated info,fix_awk_patch patches, removed obsolete sizet patch - removed linking hack -

jajcus jajcus at pld-linux.org
Sat Dec 12 13:46:01 CET 2015 

commit 46d84e2fe8c691dd7491011e39d5fe9179911ca5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 25 01:28:28 2002 +0000

    - 1.6.1
    - updated info,fix_awk_patch patches, removed obsolete sizet patch
    - removed linking hack - require fixed libtool instead (relink problem)
    
    Changed files:
        guile-fix_awk_patch.patch -> 1.2
        guile-info.patch -> 1.3
        guile-sizet.patch -> 1.2
        guile.spec -> 1.72

 guile-fix_awk_patch.patch | 10 +++----
 guile-info.patch          | 60 +++++++++++++++++++++++++++++++++++-------
 guile-sizet.patch         | 11 --------
 guile.spec                | 66 +++++++++++++++++++++--------------------------
 4 files changed, 86 insertions(+), 61 deletions(-)
---
diff --git a/guile.spec b/guile.spec
index 438cdd4..fd0d51e 100644
--- a/guile.spec
+++ b/guile.spec
@@ -1,29 +1,29 @@
 Summary:	GNU Extension language
 Summary(es):	Lenguaje de extensi�n de la GNU
 Summary(ja):	���ץꥱ�������γ�ĥ�Τ���� GNU �ˤ�� Scheme �μ���
-Summary(pl):	GNU Extension language
+Summary(pl):	J�zyk GNU Extension language
 Summary(pt_BR):	Linguagem de extens�o da GNU
 Summary(ru):	���� ���������� GNU
 Summary(uk):	���� ��������� GNU
 Name:		guile
-Version:	1.4.1
-Release:	5
+Version:	1.6.1
+Release:	1
 Epoch:		5
 License:	GPL
 Group:		Development/Languages
 Source0:	ftp://ftp.gnu.org/pub/gnu/guile/%{name}-%{version}.tar.gz
-URL:		http://www.gnu.org/software/guile/guile.html
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-fix_awk_patch.patch
 Patch2:		%{name}-SCM_SITE_DIR_path.patch
-Patch3:		%{name}-sizet.patch
-Patch4:		%{name}-axp.patch
-BuildRequires:	libltdl-devel
+Patch3:		%{name}-axp.patch
+URL:		http://www.gnu.org/software/guile/guile.html
+BuildRequires:	autoconf >= 2.53
+BuildRequires:	automake >= 1.6
+BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	texinfo
 Requires:	umb-scheme
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	libguile9
 
@@ -44,7 +44,10 @@ GUILE (GNU's Ubiquitous Intelligent Language for Extension) 
 �ޥ������¸�μ¹ԴĶ��ǡ��ץ������γ�ĥ�����󶡤��ޤ���
 
 %description -l pl
-Guile jest implementacj� Scheme napisan� w C.
+Guile jest przeno�n�, daj�c� si� wbudowa� implementacj� Scheme
+napisan� w C. Guile udost�pnia platform� wykonywania niezale�n� od
+sprz�tu, kt�ra mo�e by� do��czona jako biblioteka przy tworzeniu
+rozszerzalnych program�w.
 
 %description -l pt_BR
 Guile � um implementa��o de Scheme port�vel e embut�vel escrita em C.
@@ -135,22 +138,21 @@ Bibliotecas est
 # if you convince me... (but remember about perl, python, tcl and ruby ) (filon)
 #%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
-#rm -f missing
-#libtoolize --copy --force
-#aclocal -I guile-config
-#autoconf
-#automake -a -c -f
-#cd guile-readline
-#libtoolize --copy --force
-#aclocal
-#autoconf
-#automake -a -c -f
-#cd -
+%{__libtoolize}
+%{__aclocal} -I guile-config
+%{__autoconf}
+%{__automake}
+cd guile-readline
+%{__aclocal} -I ../guile-config
+%{__autoconf}
+# DON'T USE --force HERE - it would break build
+automake -a -c --foreign
+cd ..
 %configure \
-	--with-threads
+	--with-threads \
+	--enable-fast-install
 
 %{__make}
 #	THREAD_LIBS_LOCAL=`pwd`/qt/.libs/libqthreads.so
@@ -163,15 +165,8 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/guile/site,%{_libdir}/guile}
 	DESTDIR=$RPM_BUILD_ROOT \
 	aclocaldir=%{_aclocaldir}
 
-# this is a hack :-)
-# libtool while installing links libguilereadline with installed libguile, so (in most
-# cases) we get libguilereadline.so linked with (old) libguile.so.9 (!!!) and we cannot
-# install it, so I had to fix it :-) (filon)
-cd guile-readline
-%{__cc} -shared readline.lo -Wl,--rpath -Wl,%{_libdir} ../libguile/.libs/libguile.so \
--L%{_libdir} -lreadline -lncurses -Wl,-soname -Wl,libguilereadline.so.0 \
--o $RPM_BUILD_ROOT%{_libdir}/libguilereadline.so.0.0.1
-cd -
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -182,19 +177,18 @@ cd -
 %postun devel
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS HACKING NEWS README THANKS
 %attr(755,root,root) %{_bindir}/guile
+%attr(755,root,root) %{_bindir}/guile-tools
 %attr(755,root,root) %{_libdir}/*.so.*.*
 %{_libdir}/guile
 %{_datadir}/guile
 
 %files devel
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README
+%doc ChangeLog HACKING
 %attr(755,root,root) %{_bindir}/guile-config
 %attr(755,root,root) %{_bindir}/guile-snarf
 %attr(755,root,root) %{_libdir}/*.so
diff --git a/guile-fix_awk_patch.patch b/guile-fix_awk_patch.patch
index 87b2cfb..a2347f4 100644
--- a/guile-fix_awk_patch.patch
+++ b/guile-fix_awk_patch.patch
@@ -1,8 +1,8 @@
---- guile-1.4/libguile/guile-func-name-check.in	Sat Aug 26 19:19:07 2000
-+++ guile-1.4.new/libguile/guile-func-name-check.in	Tue Jan 11 22:47:57 2000
+--- guile-1.6.1.orig/libguile/guile-func-name-check.in	Sat Aug 26 19:19:07 2000
++++ guile-1.6.1/libguile/guile-func-name-check.in	Tue Jan 11 22:47:57 2000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/awk -f
 +#!/bin/awk -f
- # Written by Greg J. Badros, <gjb at cs.washington.edu>
- # 11-Jan-2000
- 
+ #
+ #  Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ #
diff --git a/guile-info.patch b/guile-info.patch
index c1fe949..476b7da 100644
--- a/guile-info.patch
+++ b/guile-info.patch
@@ -1,21 +1,21 @@
---- guile-1.4.1/doc/data-rep.texi~	Wed May 15 21:22:11 2002
-+++ guile-1.4.1/doc/data-rep.texi	Wed May 15 21:30:25 2002
+--- guile-1.6.1/doc/ref/data-rep.texi~	Wed May 15 21:22:11 2002
++++ guile-1.6.1/doc/ref/data-rep.texi	Wed May 15 21:30:25 2002
 @@ -7,10 +7,10 @@
- @c essay
+ 
  @c essay @include version.texi
- @c essay
+ 
 - at c essay @dircategory The Algorithmic Language Scheme
 + at c essay @dircategory Programming Languages:
  @c essay @direntry
 - at c essay * data-rep: (data-rep).  Data Representation in Guile --- how to use
-- at c essay                          Guile objects in your C code.
+- at c essay                 Guile objects in your C code.
 + at c essay * data-rep: (data-rep).			Data Representation in Guile --- how to use
-+ at c essay                          		Guile objects in your C code.
++ at c essay					Guile objects in your C code.
  @c essay @end direntry
- @c essay
+ 
  @c essay @setchapternewpage off
---- guile-1.4.1/doc/guile.texi.orig	Sun May  5 13:31:59 2002
-+++ guile-1.4.1/doc/guile.texi	Tue May 21 22:21:17 2002
+--- guile-1.6.1/doc/ref/guile.texi.orig	Sun May  5 13:31:59 2002
++++ guile-1.6.1/doc/ref/guile.texi	Tue May 21 22:21:17 2002
 @@ -24,9 +24,9 @@
  @c @cropmarks
  @c @end iftex
@@ -28,3 +28,45 @@
  @end direntry
  
  @setchapternewpage off
+--- guile-1.6.1/doc/goops/goops.texi.orig	Sat Dec  7 23:41:28 2002
++++ guile-1.6.1/doc/goops/goops.texi	Tue Dec 24 23:34:06 2002
+@@ -10,9 +10,9 @@
+ 
+ @set VERSION 0.3
+ 
+- at dircategory The Algorithmic Language Scheme
++ at dircategory Programming Languages:
+ @direntry
+-* GOOPS: (goops).               The GOOPS reference manual.
++* GOOPS: (goops).			The GOOPS reference manual
+ @end direntry
+ 
+ @macro goops
+--- guile-1.6.1/doc/r5rs/r5rs.texi.orig	Sat Dec  7 23:41:29 2002
++++ guile-1.6.1/doc/r5rs/r5rs.texi	Tue Dec 24 23:34:38 2002
+@@ -64,9 +64,9 @@
+ @c syncodeindex fn cp
+ 
+ @ifinfo
+- at dircategory The Algorithmic Language Scheme
++ at dircategory Programming Languages:
+ @direntry
+-* R5RS: (r5rs).                 The Revised(5) Report on Scheme.
++* R5RS: (r5rs).				The Revised(5) Report on Scheme
+ @end direntry
+ @end ifinfo
+ 
+--- guile-1.6.1/doc/tutorial/guile-tut.texi.orig	Sat Dec  7 23:41:30 2002
++++ guile-1.6.1/doc/tutorial/guile-tut.texi	Tue Dec 24 23:48:06 2002
+@@ -6,9 +6,9 @@
+ 
+ @include version.texi
+ 
+- at dircategory The Algorithmic Language Scheme
++ at dircategory Programming Languages:
+ @direntry
+-* Guile Tutorial: (guile-tut).  The Guile tutorial.
++* Guile Tutorial: (guile-tut).		The Guile tutorial
+ @end direntry
+ 
+ @setchapternewpage off
diff --git a/guile-sizet.patch b/guile-sizet.patch
deleted file mode 100644
index d56ca26..0000000
--- a/guile-sizet.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- guile-1.3.4/libguile/fports.c.orig	Mon May 28 17:43:09 2001
-+++ guile-1.3.4/libguile/fports.c	Mon May 28 17:43:18 2001
-@@ -433,7 +433,7 @@
- static int
- fport_fill_input (SCM port)
- {
--  int count;
-+  size_t count;
-   scm_port *pt = SCM_PTAB_ENTRY (port);
-   struct scm_fport *fp = SCM_FSTREAM (port);
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guile1.git/commitdiff/ebe6c26bec9cbe3813afc2be58f989889f8e944a

More information about the pld-cvs-commit mailing list