From 44f6f92459441fbaec137f9204ff6d97a084cdb3944a2db4abf87c05cd9ccfb1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 29 Nov 2011 11:06:52 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=36 --- guile.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/guile.spec b/guile.spec index 706d9ac..6ca59d1 100644 --- a/guile.spec +++ b/guile.spec @@ -87,9 +87,9 @@ Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension Requires: gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel # following Requires needed because /usr/bin/guile-config needs /usr/bin/guile -Requires: guile = %{version}-%{release} -Requires: libguilereadline-%{greadsuff} = %{version}-%{release} -Requires: libguile-%{gsuff} = %{version}-%{release} +Requires: guile = %{version} +Requires: libguilereadline-%{greadsuff} = %{version} +Requires: libguile-%{gsuff} = %{version} Conflicts: libguile1-devel %description devel @@ -146,7 +146,6 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %defattr(-,root,root) %doc ABOUT-NLS AUTHORS COPYING* ChangeLog GUILE-VERSION HACKING %doc LICENSE NEWS README THANKS -%defattr(-,root,root) %{_bindir}/guile-tools %{_bindir}/guild %{_bindir}/guile From 3c255369d730d4bde004ae6e8e9fbfaaf7c9cf901d1797fd0ea52ab3b2edd5f2 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 3 Dec 2011 20:43:47 +0000 Subject: [PATCH 2/5] - buildrequire ltdl-devel OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=39 --- guile.changes | 5 +++++ guile.spec | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/guile.changes b/guile.changes index b13492d..928edd7 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 3 14:24:16 UTC 2011 - coolo@suse.com + +- buildrequire ltdl-devel + ------------------------------------------------------------------- Mon Nov 28 15:51:34 UTC 2011 - pgajdos@suse.com diff --git a/guile.spec b/guile.spec index 6ca59d1..c508a65 100644 --- a/guile.spec +++ b/guile.spec @@ -14,8 +14,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - # define the name used for versioning libs and directories. %define guilemaj 2 %define guilemin 0 @@ -26,11 +24,17 @@ %define greadsuff v-%{libgreadver}-%{libgreadver} Name: guile -BuildRequires: gc-devel gmp-devel libffi46-devel libunistring-devel pkg-config readline-devel -License: LGPL-3.0+ and GPL-3.0+ and FDL-1.3+ +BuildRequires: gc-devel +BuildRequires: gmp-devel +BuildRequires: libffi46-devel +BuildRequires: libltdl-devel +BuildRequires: libunistring-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +License: FDL-1.3+ and GPL-3.0+ and LGPL-3.0+ Group: Development/Languages/Scheme Version: %{guilevers}.3 -Release: 1 +Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 @@ -51,7 +55,6 @@ C. Guile provides a machine independent execution platform that can be linked in as a library when building extensible programs. %package -n libguile-%{gsuff} -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension Requires: %{name}-modules-%{guilemaj}_%{guilemin} >= %{version} @@ -62,7 +65,6 @@ linked in as a library when building extensible programs. This package contains the shared libraries. %package modules-%{guilemaj}_%{guilemin} -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension %description modules-%{guilemaj}_%{guilemin} @@ -72,7 +74,6 @@ linked in as a library when building extensible programs. This package contains guile modules. %package -n libguilereadline-%{greadsuff} -Group: Development/Languages/Scheme Summary: GNU's Ubiquitous Intelligent Language for Extension %description -n libguilereadline-%{greadsuff} @@ -82,8 +83,7 @@ linked in as a library when building extensible programs. This package contains the shared libraries. %package devel -License: LGPL v2.1 or later -Group: Development/Languages/Scheme +License: LGPL-2.1+ Summary: GNU's Ubiquitous Intelligent Language for Extension Requires: gmp-devel readline-devel ncurses-devel gc-devel libunistring-devel libffi-devel # following Requires needed because /usr/bin/guile-config needs /usr/bin/guile From 178982e725dedd71fca7f1ca44b286d7d11821afd2c505654ab5c3fd144518e7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 3 Dec 2011 20:44:07 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=40 --- guile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guile.spec b/guile.spec index c508a65..ea62c2c 100644 --- a/guile.spec +++ b/guile.spec @@ -31,7 +31,7 @@ BuildRequires: libltdl-devel BuildRequires: libunistring-devel BuildRequires: pkg-config BuildRequires: readline-devel -License: FDL-1.3+ and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3+ and GPL-3.0+ and LGPL-3.0+ Group: Development/Languages/Scheme Version: %{guilevers}.3 Release: 0 From 047518f7f9de3fd4b4e70447782e2352d79fbfa730bf5f51c4b935662e3744e3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 3 Dec 2011 20:44:49 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=41 --- guile.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guile.spec b/guile.spec index ea62c2c..e1d709b 100644 --- a/guile.spec +++ b/guile.spec @@ -31,7 +31,7 @@ BuildRequires: libltdl-devel BuildRequires: libunistring-devel BuildRequires: pkg-config BuildRequires: readline-devel -License: GFDL-1.3+ and GPL-3.0+ and LGPL-3.0+ +License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ Group: Development/Languages/Scheme Version: %{guilevers}.3 Release: 0 From d0e89b0e9a18a79c487a1f4c15ea4b235348c781334bd4dfee26a6c8c77fa32a Mon Sep 17 00:00:00 2001 From: Petr Vanek Date: Fri, 9 Dec 2011 11:33:34 +0000 Subject: [PATCH 5/5] Accepting request 96087 from home:dimstar:branches:GNOME:Factory Remove those nasty .la files... their existance breaks for example aisleriot at the moment (Alternative solution would be to Require ltdl-devel from guile-devel package.) OBS-URL: https://build.opensuse.org/request/show/96087 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=42 --- guile.changes | 5 +++++ guile.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/guile.changes b/guile.changes index 928edd7..b4d9f62 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 9 10:38:37 UTC 2011 - dimstar@opensuse.org + +- Drop libtool archives. + ------------------------------------------------------------------- Sat Dec 3 14:24:16 UTC 2011 - coolo@suse.com diff --git a/guile.spec b/guile.spec index e1d709b..f7955c9 100644 --- a/guile.spec +++ b/guile.spec @@ -14,6 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + # define the name used for versioning libs and directories. %define guilemaj 2 %define guilemin 0 @@ -120,6 +122,7 @@ LD_LIBRARY_PATH="." make check %install make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/guile/site +find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz @@ -178,7 +181,6 @@ rm -f usr/share/guile/site/slibcat.SuSEconfig %doc %{_infodir}/%{name}.info-1[0-9].gz %doc %{_infodir}/r5rs.info.gz %{_libdir}/libguile*.so -%{_libdir}/libguile*.la %{_libdir}/pkgconfig/guile-%{guilevers}.pc %changelog