packages: guile/guile-as-needed.patch, guile/guile-fix_awk_patch.patch, gui...

Wed Mar 9 20:49:10 CET 2011

Author: qboosh                       Date: Wed Mar  9 19:49:10 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.0.0 (new sonames etc.)
- updated info,as-needed,fix_awk_patch patches
- removed outdated unknown_arch patch

---- Files affected:
packages/guile:
   guile-as-needed.patch (1.3 -> 1.4) , guile-fix_awk_patch.patch (1.2 -> 1.3) , guile-info.patch (1.4 -> 1.5) , guile.spec (1.131 -> 1.132) , guile-unknown_arch.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/guile/guile-as-needed.patch
diff -u packages/guile/guile-as-needed.patch:1.3 packages/guile/guile-as-needed.patch:1.4

--- packages/guile/guile-as-needed.patch:1.3	Fri Feb 22 23:11:18 2008
+++ packages/guile/guile-as-needed.patch	Wed Mar  9 20:49:05 2011
@@ -9,8 +9,8 @@
  libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
  
  # These are headers visible as <guile/mumble.h>
---- guile-1.8.4/configure.in.orig	2008-02-17 00:15:18.000000000 +0100
-+++ guile-1.8.4/configure.in	2008-02-22 20:54:38.414020961 +0100
+--- guile-2.0.0/configure.ac.orig	2008-02-17 00:15:18.000000000 +0100
++++ guile-2.0.0/configure.ac	2008-02-22 20:54:38.414020961 +0100
 @@ -1405,7 +1405,7 @@
  #######################################################################
  

================================================================
Index: packages/guile/guile-fix_awk_patch.patch
diff -u packages/guile/guile-fix_awk_patch.patch:1.2 packages/guile/guile-fix_awk_patch.patch:1.3
--- packages/guile/guile-fix_awk_patch.patch:1.2	Wed Dec 25 02:28:28 2002
+++ packages/guile/guile-fix_awk_patch.patch	Wed Mar  9 20:49:05 2011
@@ -1,5 +1,5 @@
---- 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
+--- guile-2.0.0.orig/libguile/guile-func-name-check	Sat Aug 26 19:19:07 2000
++++ guile-2.0.0/libguile/guile-func-name-check	Tue Jan 11 22:47:57 2000
 @@ -1,4 +1,4 @@
 -#!/usr/bin/awk -f
 +#!/bin/awk -f

================================================================
Index: packages/guile/guile-info.patch
diff -u packages/guile/guile-info.patch:1.4 packages/guile/guile-info.patch:1.5
--- packages/guile/guile-info.patch:1.4	Mon Nov 26 23:46:34 2007
+++ packages/guile/guile-info.patch	Wed Mar  9 20:49:05 2011
@@ -1,16 +1,3 @@
---- 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
-@@ -9,8 +9,8 @@
- 
- @c essay @dircategory The Algorithmic Language Scheme
- @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 * data-rep: (data-rep).			Data Representation in Guile --- how to use
-+ at c essay					Guile objects in your C code.
- @c essay @end direntry
- 
- @c essay @setchapternewpage off
 --- 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
 @@ -26,7 +26,7 @@
@@ -22,17 +9,6 @@
  @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
-@@ -8,7 +8,7 @@
- 
- @dircategory The Algorithmic Language Scheme
- @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
 @@ -66,7 +66,7 @@
@@ -44,14 +20,3 @@
  @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
-@@ -8,7 +8,7 @@
- 
- @dircategory The Algorithmic Language Scheme
- @direntry
--* Guile Tutorial: (guile-tut).  The Guile tutorial.
-+* Guile Tutorial: (guile-tut).		The Guile tutorial
- @end direntry
- 
- @setchapternewpage off

================================================================
Index: packages/guile/guile.spec
diff -u packages/guile/guile.spec:1.131 packages/guile/guile.spec:1.132
--- packages/guile/guile.spec:1.131	Sat Feb  5 00:30:07 2011
+++ packages/guile/guile.spec	Wed Mar  9 20:49:05 2011
@@ -4,7 +4,7 @@
 %bcond_without	tests	# don't perform ./check-guile
 %bcond_without	emacs	# don't build emacs subpackage
 #
-%define		ver	1.8
+%define		ver	2.0
 Summary:	GNU Extension language
 Summary(es.UTF-8):	Lenguaje de extensión de la GNU
 Summary(ja.UTF-8):	アプリケーションの拡張のための GNU による Scheme の実装
@@ -13,23 +13,24 @@
 Summary(ru.UTF-8):	Язык расширений GNU
 Summary(uk.UTF-8):	Мова розширень GNU
 Name:		guile
-Version:	1.8.8
+Version:	2.0.0
 Release:	1
 Epoch:		5
-License:	GPL v2+/LGPL v2.1+
+License:	LGPL v3+
 Group:		Development/Languages
 Source0:	http://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.gz
-# Source0-md5:	18661a8fdfef13e2fcb7651720aa53f3
+# Source0-md5:	4f91ca29077aca32e1e28f70220dfd9b
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-fix_awk_patch.patch
-Patch2:		%{name}-unknown_arch.patch
-Patch3:		%{name}-as-needed.patch
+Patch2:		%{name}-as-needed.patch
 URL:		http://www.gnu.org/software/guile/guile.html
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.10
 %{?with_emacs:BuildRequires:	emacs}
+BuildRequires:	gc-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gmp-devel >= 4.1
+BuildRequires:	libffi-devel
 BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	ncurses-devel >= 5.2
@@ -91,7 +92,9 @@
 Summary(uk.UTF-8):	Файли для розробки програм з Guile
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gc-devel
 Requires:	gmp-devel >= 4.1
+Requires:	libffi-devel
 Requires:	libltdl-devel
 Requires:	m4
 Obsoletes:	libguile9-devel
@@ -161,8 +164,9 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
+# popen test currently fails
+%{__rm} test-suite/tests/popen.test
 
 %build
 %{__gettextize}
@@ -170,19 +174,11 @@
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-cd guile-readline
-%{__libtoolize}
-%{__aclocal} -I ../guile-config
-%{__autoconf}
-# DON'T USE --force HERE - it would break build
-automake -a -c --foreign
-cd ..
 %configure \
-	--enable-error-on-warning=no
+	--disable-silent-rules
 
 %{__make}
 
-%{?with_tests:%{__make} -C libguile stack-limit-calibration.scm}
 %{?with_tests:./check-guile}
 
 %install
@@ -207,37 +203,30 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS LICENSE NEWS README THANKS
 %attr(755,root,root) %{_bindir}/guile
 %attr(755,root,root) %{_bindir}/guile-tools
-%attr(755,root,root) %{_libdir}/libguile.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile.so.17
-# shared libraries dlopened by interpreter (.so or .la needed)
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-1-v-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-srfi-srfi-1-v-3.so.3
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-1-v-3.so
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-4-v-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-srfi-srfi-4-v-3.so.3
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-4-v-3.so
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-13-14-v-3.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-srfi-srfi-13-14-v-3.so.3
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-13-14-v-3.so
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-60-v-2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguile-srfi-srfi-60-v-2.so.2
-%attr(755,root,root) %{_libdir}/libguile-srfi-srfi-60-v-2.so
-%attr(755,root,root) %{_libdir}/libguilereadline-v-17.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libguilereadline-v-17.so.17
-%attr(755,root,root) %{_libdir}/libguilereadline-v-17.so
+%attr(755,root,root) %{_libdir}/libguile-2.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libguile-2.0.so.22
+# shared library dlopened by interpreter (.so or .la needed)
+%attr(755,root,root) %{_libdir}/libguilereadline-v-18.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libguilereadline-v-18.so.18
+%attr(755,root,root) %{_libdir}/libguilereadline-v-18.so
 %{_libdir}/guile
 %dir %{_datadir}/guile
 %dir %{_datadir}/guile/%{ver}
 %{_datadir}/guile/%{ver}/guile-procedures.txt
+%{_datadir}/guile/%{ver}/*.scm
 %{_datadir}/guile/%{ver}/ice-9
-%{_datadir}/guile/%{ver}/lang
+%{_datadir}/guile/%{ver}/language
 %{_datadir}/guile/%{ver}/oop
-%dir %{_datadir}/guile/%{ver}/scripts
-%attr(755,root,root) %{_datadir}/guile/%{ver}/scripts/*
+%{_datadir}/guile/%{ver}/rnrs
+%{_datadir}/guile/%{ver}/scripts
 %{_datadir}/guile/%{ver}/srfi
+%{_datadir}/guile/%{ver}/sxml
+%{_datadir}/guile/%{ver}/system
+%{_datadir}/guile/%{ver}/texinfo
+%{_datadir}/guile/%{ver}/web
 %dir %{_datadir}/guile/site
 %{_mandir}/man1/guile.1*
 
@@ -246,31 +235,19 @@
 %doc ChangeLog HACKING
 %attr(755,root,root) %{_bindir}/guile-config
 %attr(755,root,root) %{_bindir}/guile-snarf
-%attr(755,root,root) %{_libdir}/libguile.so
-%{_libdir}/libguile.la
-%{_libdir}/libguile-srfi-srfi-1-v-3.la
-%{_libdir}/libguile-srfi-srfi-4-v-3.la
-%{_libdir}/libguile-srfi-srfi-13-14-v-3.la
-%{_libdir}/libguile-srfi-srfi-60-v-2.la
-%{_libdir}/libguilereadline-v-17.la
-%{_infodir}/goops.info*
+%attr(755,root,root) %{_libdir}/libguile-2.0.so
+%{_libdir}/libguile-2.0.la
+%{_libdir}/libguilereadline-v-18.la
 %{_infodir}/guile.info*
-%{_infodir}/guile-tut.info*
 %{_infodir}/r5rs.info*
 %{_includedir}/guile
-%{_includedir}/libguile
-%{_includedir}/libguile.h
-%{_pkgconfigdir}/guile-1.8.pc
+%{_pkgconfigdir}/guile-2.0.pc
 %{_aclocaldir}/guile.m4
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libguile.a
-%{_libdir}/libguile-srfi-srfi-1-v-3.a
-%{_libdir}/libguile-srfi-srfi-4-v-3.a
-%{_libdir}/libguile-srfi-srfi-13-14-v-3.a
-%{_libdir}/libguile-srfi-srfi-60-v-2.a
-%{_libdir}/libguilereadline-v-17.a
+%{_libdir}/libguile-2.0.a
+%{_libdir}/libguilereadline-v-18.a
 
 %if %{with emacs}
 %files -n emacs-guile-mode-pkg
@@ -284,6 +261,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2011/03/09 19:49:05  qboosh
+- updated to 2.0.0 (new sonames etc.)
+- updated info,as-needed,fix_awk_patch patches
+- removed outdated unknown_arch patch
+
 Revision 1.131  2011/02/04 23:30:07  sparky
 - %description <name> for correct %package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/guile/guile-as-needed.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/guile/guile-fix_awk_patch.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/guile/guile-info.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/guile/guile.spec?r1=1.131&r2=1.132&f=u

