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
This commit is contained in:
Guido Berhoerster 2013-03-11 07:13:04 +00:00 committed by Git OBS Bridge
parent 9de945f9d6
commit 10ddf711ae
2 changed files with 17 additions and 10 deletions

View File

@ -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 Tue Jan 1 15:27:05 UTC 2013 - gber@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package xfce4-terminal # 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. # Copyright (c) 2012 Guido Berhoerster.
# #
# All modifications and additions to the file contributed by third parties # 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(exo-1)
BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(vte)
BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(vte)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Provides: Terminal = %{version} Provides: Terminal = %{version}
Obsoletes: Terminal < %{version} Obsoletes: Terminal < %{version}
Obsoletes: Terminal-doc < %{version}
%description %description
xfce4-terminal is a lightweight and easy to use terminal emulator for the Xfce xfce4-terminal is a lightweight and easy to use terminal emulator for the Xfce
@ -57,6 +58,7 @@ Supplements: packageand(bundle-lang-other:%{name})
Provides: Terminal-lang = %{version} Provides: Terminal-lang = %{version}
Obsoletes: Terminal-lang < %{version} Obsoletes: Terminal-lang < %{version}
BuildArch: noarch BuildArch: noarch
%description lang %description lang
Provides translations to the package %{name} Provides translations to the package %{name}