pool/enlightenment-branding-openSUSE
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed another mistery conflict

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=23
This commit is contained in:
Simon Lees 2014-12-31 00:45:22 +00:00 committed by Git OBS Bridge
parent 91bec9628f
commit 31db183cee
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
enlightenment-branding-openSUSE.changes
View File

@ -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 Mon Sep 22 02:43:56 UTC 2014 - simon@simotek.net

11
enlightenment-branding-openSUSE.spec
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) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,25 +15,28 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: enlightenment-branding-openSUSE Name: enlightenment-branding-openSUSE
Version: 0.1 Version: 0.1
Release: 0 Release: 0
License: GPL-2.0
Summary: Enlightenment openSUSE branding Summary: Enlightenment openSUSE branding
Url: https://en.opensuse.org/Portal:Enlightenment License: GPL-2.0
Group: System/GUI/Other Group: System/GUI/Other
Url: https://en.opensuse.org/Portal:Enlightenment
Source: def-ibar.txt Source: def-ibar.txt
Source2: AUTHORS Source2: AUTHORS
Source3: COPYING Source3: COPYING
Provides: enlightenment-branding = %version Provides: enlightenment-branding = %version
Supplements: packageand(enlightenment:branding-openSUSE) Supplements: packageand(enlightenment:branding-openSUSE)
Conflicts: otherproviders(enlightenment-branding) Conflicts: otherproviders(enlightenment-branding)
Requires: enlightenment-profiles-openSUSE
#provides default elementary theme #provides default elementary theme
Requires: enlightenment-theme-openSUSE Requires: enlightenment-theme-openSUSE
Recommends: enlightenment-theme-dark Recommends: enlightenment-theme-dark
Recommends: enlightenment-theme-openSUSE-bluegreen Recommends: enlightenment-theme-openSUSE-bluegreen
Recommends: enlightenment-theme-openSUSE-ice Recommends: enlightenment-theme-openSUSE-ice
Recommends: enlightenment-theme-openSUSE-oliveleaf Recommends: enlightenment-theme-openSUSE-oliveleaf
Requires: enlightenment-profiles-openSUSE
# recommend terminology to make xdg-open look better # recommend terminology to make xdg-open look better
Recommends: terminology Recommends: terminology
Conflicts: terminology-theme-upstream Conflicts: terminology-theme-upstream