From 10ddf711aee16b5c1ccfaef79c9f65e27592ca4c4f7430a07a074f1089c0e2c4 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 11 Mar 2013 07:13:04 +0000 Subject: [PATCH] Accepting request 158242 from home:coolo:branches:openSUSE:Factory - also obsolete Terminal-doc or you get an error on update OBS-URL: https://build.opensuse.org/request/show/158242 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-terminal?expand=0&rev=6 --- xfce4-terminal.changes | 5 +++++ xfce4-terminal.spec | 22 ++++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xfce4-terminal.changes b/xfce4-terminal.changes index f7697b5..32f9f85 100644 --- a/xfce4-terminal.changes +++ b/xfce4-terminal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 11 06:15:05 UTC 2013 - coolo@suse.com + +- also obsolete Terminal-doc or you get an error on update + ------------------------------------------------------------------- Tue Jan 1 15:27:05 UTC 2013 - gber@opensuse.org diff --git a/xfce4-terminal.spec b/xfce4-terminal.spec index 592bc82..8e9372a 100644 --- a/xfce4-terminal.spec +++ b/xfce4-terminal.spec @@ -1,7 +1,7 @@ # # spec file for package xfce4-terminal # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Guido Berhoerster. # # All modifications and additions to the file contributed by third parties @@ -32,12 +32,13 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exo-1) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(vte) BuildRequires: pkgconfig(libxfce4ui-1) +BuildRequires: pkgconfig(vte) BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} Provides: Terminal = %{version} Obsoletes: Terminal < %{version} +Obsoletes: Terminal-doc < %{version} %description xfce4-terminal is a lightweight and easy to use terminal emulator for the Xfce @@ -49,14 +50,15 @@ helps to save space on the desktop. # expanded %%lang_package with Obsoletes/Provides added %package lang -Summary: Languages for package %{name} -Group: System/Localization -Requires: %{name} = %{version} -Provides: %{name}-lang-all = %{version} -Supplements: packageand(bundle-lang-other:%{name}) -Provides: Terminal-lang = %{version} -Obsoletes: Terminal-lang < %{version} -BuildArch: noarch +Summary: Languages for package %{name} +Group: System/Localization +Requires: %{name} = %{version} +Provides: %{name}-lang-all = %{version} +Supplements: packageand(bundle-lang-other:%{name}) +Provides: Terminal-lang = %{version} +Obsoletes: Terminal-lang < %{version} +BuildArch: noarch + %description lang Provides translations to the package %{name}