Hello community, here is the log from the commit of package guile1 for openSUSE:Factory checked in at 2012-01-25 15:01:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/guile1 (Old) and /work/SRC/openSUSE:Factory/.guile1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/guile1/guile1.changes 2012-01-20 20:23:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.guile1.new/guile1.changes 2012-01-25 15:01:45.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Jan 25 09:00:05 UTC 2012 - pgaj...@suse.com + +- package /usr/share/aclocal/guile1.m4 (gnucash uses autoreconf) + (GUILE_* macros renamed to GUILE1_*) [bnc#724917] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ guile1.spec ++++++ --- /var/tmp/diff_new_pack.mVz8nU/_old 2012-01-25 15:01:46.000000000 +0100 +++ /var/tmp/diff_new_pack.mVz8nU/_new 2012-01-25 15:01:46.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package guile +# spec file for package guile1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,24 @@ %define binpref guile1 Name: guile1 -BuildRequires: gc-devel gmp-devel readline-devel pkg-config automake libtool -License: LGPL-2.1+ -Group: Development/Languages/Scheme +BuildRequires: automake +BuildRequires: gc-devel +BuildRequires: gmp-devel +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: readline-devel Version: 1.8.8 Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension +License: LGPL-2.1+ +Group: Development/Languages/Scheme Url: http://www.gnu.org/software/guile/ Source0: guile-%{version}.tar.bz2 Patch1: guile-64bit.patch Patch2: guile-1.6.10-mktemp.patch Patch3: guile-popen-test.patch Patch5: guile-gcc.patch -BuildRoot: %{_tmppath}/guile-%{version}-build +BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq Conflicts: slib < 3a5 @@ -41,8 +46,8 @@ linked in as a library when building extensible programs. %package -n libguile17 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguile17 This is Guile, a portable, embeddable Scheme implementation written in @@ -51,8 +56,8 @@ contains the shared libraries. %package -n libguile-srfi-srfi-1-v-3-3 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguile-srfi-srfi-1-v-3-3 This is Guile, a portable, embeddable Scheme implementation written in @@ -61,8 +66,8 @@ contains the shared libraries. %package -n libguile-srfi-srfi-4-v-3-3 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguile-srfi-srfi-4-v-3-3 This is Guile, a portable, embeddable Scheme implementation written in @@ -71,8 +76,8 @@ contains the shared libraries. %package -n libguile-srfi-srfi-13-14-v-3-3 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguile-srfi-srfi-13-14-v-3-3 This is Guile, a portable, embeddable Scheme implementation written in @@ -81,8 +86,8 @@ contains the shared libraries. %package -n libguile-srfi-srfi-60-v-2-2 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguile-srfi-srfi-60-v-2-2 This is Guile, a portable, embeddable Scheme implementation written in @@ -91,8 +96,8 @@ contains the shared libraries. %package -n libguilereadline-v-17-17 -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme %description -n libguilereadline-v-17-17 This is Guile, a portable, embeddable Scheme implementation written in @@ -102,8 +107,8 @@ %package -n libguile1-devel -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension +Group: Development/Languages/Scheme Requires: libguilereadline-v-17-17 = %{version}-%{release} Requires: libguile-srfi-srfi-60-v-2-2 = %{version}-%{release} Requires: libguile-srfi-srfi-1-v-3-3 = %{version}-%{release} @@ -146,6 +151,8 @@ sed -i s/-Werror// configure.in configure %build +sed -i "s:GUILE_:GUILE1_:" guile-config/guile.m4 +sed -i "s:guile:guile1:" guile-config/guile.m4 autoreconf -fi # FIXME: Following files are apparently compiled without RPM_OPT_FLAGS: # gen-scmconfig.c,c-tokenize.c @@ -161,7 +168,7 @@ mkdir -p %{buildroot}%{_datadir}/guile/site rm -r %{buildroot}%{_infodir} # conflict with guile2 -rm %{buildroot}%{_datadir}/aclocal/guile.m4 +mv %{buildroot}%{_datadir}/aclocal/guile{,1}.m4 # use /usr/bin/guile1 instead of /usr/bin/guile sed -i "s:${GUILE-guile}:${GUILE-guile1}:" %{buildroot}%{_datadir}/guile/1.8/scripts/* sed -i "s:/usr/bin/guile:/usr/bin/guile1:" %{buildroot}%{_bindir}/guile1-config @@ -247,5 +254,6 @@ %{_libdir}/libguile*.so %{_libdir}/libguile*.la %{_libdir}/pkgconfig/* +%{_datadir}/aclocal/guile1.m4 %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
