From 9cb80438f042d18ea62f3e58a4b0a0403535f9bb869ebddb8e43856cc7714ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 6 May 2011 21:12:08 +0000 Subject: [PATCH] Accepting request 69727 from home:dirkmueller:branches:multimedia:libs - fix provides/obsoletes in baselibs OBS-URL: https://build.opensuse.org/request/show/69727 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=27 --- baselibs.conf | 2 ++ libvorbis.changes | 5 +++++ libvorbis.spec | 12 ++++++------ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 789fb70..830ea6e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,5 @@ libvorbis0 + targettype 32bit provides "libvorbis- = 1.3.2" + targettype 64bit obsoletes "libvorbis- < 1.3.2" libvorbisenc2 libvorbisfile3 diff --git a/libvorbis.changes b/libvorbis.changes index e56602b..0edc558 100644 --- a/libvorbis.changes +++ b/libvorbis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 5 22:56:15 CEST 2011 - dmueller@suse.de + +- fix provides/obsoletes in baselibs + ------------------------------------------------------------------- Thu Dec 9 22:14:53 UTC 2010 - davejplater@gmail.com diff --git a/libvorbis.spec b/libvorbis.spec index 0221316..c663afa 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -1,5 +1,5 @@ # -# spec file for package libvorbis (Version to_be_filled_by_service) +# spec file for package libvorbis (Version 1.3.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,10 +16,11 @@ # + Name: libvorbis Version: 1.3.2 +Release: 2 #to_be_filled_by_service -Release: 1 License: BSD3c(or similar) Summary: The Vorbis General Audio Compression Codec Url: http://www.vorbis.com/ @@ -38,7 +39,7 @@ Patch2: libvorbis-m4.dif # PATCH-FIX-UPSTREAM libvorbis-pkgconfig.patch https://trac.xiph.org/ticket/1759 reddwarf@opensuse.org -- Use Requires/Libs.private to avoid overlinking Patch10: libvorbis-pkgconfig.patch BuildRequires: libogg-devel -BuildRequires: pkgconfig fdupes +BuildRequires: fdupes pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -60,9 +61,8 @@ Obsoletes: libvorbis-64bit %endif # # libvorbis was last used in openSUSE 11.3 - -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} +Provides: %{name} = 1.3.2 +Obsoletes: %{name} < 1.3.2 %description -n libvorbis0 Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and