From 31db183cee557eba878a937f579af12115b4fcc3a58091cc3e78775bdf7a9dea Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 31 Dec 2014 00:45:22 +0000 Subject: [PATCH 1/4] Fixed another mistery conflict OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=23 --- enlightenment-branding-openSUSE.changes | 6 ++++++ enlightenment-branding-openSUSE.spec | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/enlightenment-branding-openSUSE.changes b/enlightenment-branding-openSUSE.changes index 1229f02..d76cf96 100644 --- a/enlightenment-branding-openSUSE.changes +++ b/enlightenment-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/enlightenment-branding-openSUSE.spec b/enlightenment-branding-openSUSE.spec index f7d65c7..8a3e2a3 100644 --- a/enlightenment-branding-openSUSE.spec +++ b/enlightenment-branding-openSUSE.spec @@ -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) 2014 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,29 +15,32 @@ # 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 From b6dbc924966f972dafab5f1004277760a8a14d19c49a9477566616fceaa700e1 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 10 Jun 2015 06:56:01 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=24 --- enlightenment-branding-openSUSE.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/enlightenment-branding-openSUSE.spec b/enlightenment-branding-openSUSE.spec index 8a3e2a3..ba37060 100644 --- a/enlightenment-branding-openSUSE.spec +++ b/enlightenment-branding-openSUSE.spec @@ -43,6 +43,11 @@ 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. From dcc38ae36fdc74af500ba044b98125f1f717e4ff5cd6afcd9c440828ebac5de7 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 10 Jun 2015 06:56:30 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=25 --- enlightenment-branding-openSUSE.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/enlightenment-branding-openSUSE.changes b/enlightenment-branding-openSUSE.changes index d76cf96..199e8c2 100644 --- a/enlightenment-branding-openSUSE.changes +++ b/enlightenment-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 From 0322ab949f1ed6156d8e70b5be5ceaf30281e97a70334f5dd34c83e1a7c17ade Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Wed, 10 Jun 2015 13:27:06 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=26 --- enlightenment-branding-openSUSE.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enlightenment-branding-openSUSE.spec b/enlightenment-branding-openSUSE.spec index ba37060..e59bb0c 100644 --- a/enlightenment-branding-openSUSE.spec +++ b/enlightenment-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package enlightenment-branding-openSUSE # -# Copyright (c) 2014 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