From b3f6e52d84c41abc70e17e0ed6d292877efa00cf48d81cf379de9d7a1a08e4a5 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 18 Jan 2012 16:23:03 +0000 Subject: [PATCH] - don't conflict with guile1 [bnc#724917] OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/guile?expand=0&rev=44 --- guile.changes | 5 +++++ guile.spec | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/guile.changes b/guile.changes index b4d9f62..c1796cf 100644 --- a/guile.changes +++ b/guile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 18 16:21:57 UTC 2012 - pgajdos@suse.com + +- don't conflict with guile1 [bnc#724917] + ------------------------------------------------------------------- Fri Dec 9 10:38:37 UTC 2011 - dimstar@opensuse.org diff --git a/guile.spec b/guile.spec index f7955c9..de4c3e9 100644 --- a/guile.spec +++ b/guile.spec @@ -1,7 +1,7 @@ # # spec file for package guile # -# 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 @@ -15,7 +15,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 @@ -33,11 +32,11 @@ BuildRequires: libltdl-devel BuildRequires: libunistring-devel BuildRequires: pkg-config BuildRequires: readline-devel -License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ -Group: Development/Languages/Scheme Version: %{guilevers}.3 Release: 0 Summary: GNU's Ubiquitous Intelligent Language for Extension +License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +Group: Development/Languages/Scheme Url: http://www.gnu.org/software/guile/ Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-64bit.patch @@ -49,7 +48,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils sh-utils PreReq: %install_info_prereq Conflicts: slib < 3a5 -Conflicts: guile1 %description This is Guile, a portable, embeddable Scheme implementation written in @@ -58,6 +56,8 @@ linked in as a library when building extensible programs. %package -n libguile-%{gsuff} Summary: GNU's Ubiquitous Intelligent Language for Extension +License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +Group: Development/Languages/Scheme Requires: %{name}-modules-%{guilemaj}_%{guilemin} >= %{version} %description -n libguile-%{gsuff} @@ -68,6 +68,8 @@ contains the shared libraries. %package modules-%{guilemaj}_%{guilemin} Summary: GNU's Ubiquitous Intelligent Language for Extension +License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +Group: Development/Languages/Scheme %description modules-%{guilemaj}_%{guilemin} This is Guile, a portable, embeddable Scheme implementation written in @@ -77,6 +79,8 @@ contains guile modules. %package -n libguilereadline-%{greadsuff} Summary: GNU's Ubiquitous Intelligent Language for Extension +License: GFDL-1.3 and GPL-3.0+ and LGPL-3.0+ +Group: Development/Languages/Scheme %description -n libguilereadline-%{greadsuff} This is Guile, a portable, embeddable Scheme implementation written in @@ -85,14 +89,14 @@ linked in as a library when building extensible programs. This package contains the shared libraries. %package devel -License: LGPL-2.1+ Summary: GNU's Ubiquitous Intelligent Language for Extension +License: LGPL-2.1+ +Group: Development/Languages/Scheme 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} Requires: libguilereadline-%{greadsuff} = %{version} Requires: libguile-%{gsuff} = %{version} -Conflicts: libguile1-devel %description devel This is Guile, a portable, embeddable Scheme implementation written in