Accepting request 311462 from X11:Enlightenment:Factory

Fix obsoletes for e17 to e19 upgrades but not if e17 was manually selected

OBS-URL: https://build.opensuse.org/request/show/311462
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/enlightenment-branding-openSUSE?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2015-06-11 06:23:27 +00:00 committed by Git OBS Bridge
commit 4ab4ee1334
2 changed files with 29 additions and 9 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Jun 10 06:56:12 UTC 2015 - simon@simotek.net
- At the recommendation of DimStar Obsolete but don't provide
e17 branding
-------------------------------------------------------------------
Mon Dec 29 11:58:54 UTC 2014 - simon@simotek.net
- Should require openSUSE Profiles as these are a fundamental part
of the branding
-------------------------------------------------------------------
Mon Sep 22 02:43:56 UTC 2014 - simon@simotek.net

View File

@ -1,7 +1,7 @@
#
# spec file for package e17-branding-openSUSE
# spec file for package enlightenment-branding-openSUSE
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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,31 +15,39 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: enlightenment-branding-openSUSE
Version: 0.1
Release: 0
License: GPL-2.0
Summary: Enlightenment openSUSE branding
Url: https://en.opensuse.org/Portal:Enlightenment
License: GPL-2.0
Group: System/GUI/Other
Url: https://en.opensuse.org/Portal:Enlightenment
Source: def-ibar.txt
Source2: AUTHORS
Source3: COPYING
Provides: enlightenment-branding = %version
Supplements: packageand(enlightenment:branding-openSUSE)
Conflicts: otherproviders(enlightenment-branding)
Requires: enlightenment-profiles-openSUSE
#provides default elementary theme
Requires: enlightenment-theme-openSUSE
Recommends: enlightenment-theme-dark
Requires: enlightenment-theme-openSUSE
Recommends: enlightenment-theme-dark
Recommends: enlightenment-theme-openSUSE-bluegreen
Recommends: enlightenment-theme-openSUSE-ice
Recommends: enlightenment-theme-openSUSE-oliveleaf
Requires: enlightenment-profiles-openSUSE
# recommend terminology to make xdg-open look better
Recommends: terminology
Conflicts: terminology-theme-upstream
Conflicts: e-branding-openSUSE
Recommends: terminology
Conflicts: terminology-theme-upstream
Conflicts: e-branding-openSUSE
Conflicts: otherproviders(e17-branding)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# At recomendation of DimStar, add obsoletes but not Provides, this way people being
# auto upgraded by the enlightenment pattern will be upgraded without any issues and
# people who have manually installed e17 will be able to keep it
Obsoletes: e17-branding-openSUSE
Obsoletes: e-branding-openSUSE
%description
openSUSE specific files as specific branding.