Hello community, here is the log from the commit of package guile checked in at Mon Sep 8 01:31:38 CEST 2008. -------- --- guile/guile.changes 2008-07-07 16:50:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/guile/guile.changes 2008-09-07 11:34:24.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 7 11:34:14 CEST 2008 - schwab@suse.de + +- Fix conflicting options. + +------------------------------------------------------------------- New: ---- guile-ac.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile.spec ++++++ --- /var/tmp/diff_new_pack.K10801/_old 2008-09-08 01:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.K10801/_new 2008-09-08 01:31:15.000000000 +0200 @@ -2,13 +2,19 @@ # spec file for package guile (Version 1.8.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: guile @@ -17,13 +23,14 @@ Group: Development/Languages/Scheme AutoReqProv: on Version: 1.8.5 -Release: 1 +Release: 22 %define GUILEVERSION 1.8 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch Patch2: %{name}-1.6.10-mktemp.patch +Patch3: %{name}-ac.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq @@ -81,6 +88,7 @@ %setup -q %patch1 %patch2 +%patch3 # guile-1.8.1: The code is not so good for -Werror (unused results of write()). sed -i s/-Werror// configure.in configure @@ -101,14 +109,14 @@ rm -fr $RPM_BUILD_ROOT %post -%run_ldconfig +/sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/goops.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/r5rs.info.gz %postun -%run_ldconfig +/sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/goops.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/guile-tut.info.gz @@ -143,6 +151,8 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Sep 07 2008 schwab@suse.de +- Fix conflicting options. * Mon Jul 07 2008 pgajdos@suse.cz - updated to 1.8.5: * new modules `(srfi srfi-88)' ++++++ guile-ac.patch ++++++ --- configure.in +++ configure.in @@ -38,7 +38,7 @@ AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VE ]), [bug-guile@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]) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org