chore(packaging: arch): add conflicts with oomox/oomox-git (re: #129)

themix-project · Mar 17, 2020 · 7afb2f7 · 7afb2f7
1 parent b341dd7
commit 7afb2f7
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 14 deletions.
diff --git a/packaging/arch/PKGBUILD_full b/packaging/arch/PKGBUILD_full
@@ -1,7 +1,7 @@
 # Maintainer: Yauhen Kirylau <actionless DOT loveless PLUS aur AT gmail MF com>
 # Upstream URL: https://github.com/themix-project/oomox
 
-pkgname=themix-full-git
+pkgname=themix-full
 pkgver=1.13
 pkgrel=1
 pkgdesc="Themix: GUI for generating different color variations
@@ -41,5 +41,15 @@ makedepends=(
 )
 optdepends=(
 )
+provides=(
+)
+conflicts=(
+    'themix-full-git'
+    'oomox-git'
+    'oomox'
+)
+replaces=(
+    'oomox'
+)
 
 # vim: ft=PKGBUILD
diff --git a/packaging/arch/PKGBUILD_full_git b/packaging/arch/PKGBUILD_full_git
@@ -46,6 +46,8 @@ provides=(
 )
 conflicts=(
     'themix-full'
+    'oomox-git'
+    'oomox'
 )
 replaces=(
     'oomox-git'

diff --git a/packaging/arch/PKGBUILD_gui b/packaging/arch/PKGBUILD_gui
@@ -42,7 +42,11 @@ optdepends=(
 	'xorg-xrdb: for the `xresources` theme'
 )
 provides=('themix-gui')
-conflicts=('themix-gui')
+conflicts=(
+    'themix-gui'
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/oomox"

diff --git a/packaging/arch/PKGBUILD_icons_archdroid b/packaging/arch/PKGBUILD_icons_archdroid
@@ -35,7 +35,11 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_icons_gnome_colors b/packaging/arch/PKGBUILD_icons_gnome_colors
@@ -40,7 +40,11 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_icons_numix b/packaging/arch/PKGBUILD_icons_numix
@@ -36,7 +36,11 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/${_reponame1}"

diff --git a/packaging/arch/PKGBUILD_icons_papirus b/packaging/arch/PKGBUILD_icons_papirus
@@ -34,7 +34,11 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_icons_suruplus b/packaging/arch/PKGBUILD_icons_suruplus
@@ -34,7 +34,11 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_icons_suruplus_aspromauros b/packaging/arch/PKGBUILD_icons_suruplus_aspromauros
@@ -31,7 +31,12 @@ options=(
 	'!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
+
 
 pkgver() {
 	cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_import_image b/packaging/arch/PKGBUILD_import_image
@@ -26,7 +26,11 @@ optdepends=(
 	'python-haishoku: additional image analyzer'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
 	cd "${srcdir}/oomox"

diff --git a/packaging/arch/PKGBUILD_theme_arc b/packaging/arch/PKGBUILD_theme_arc
@@ -44,7 +44,12 @@ options=(
        '!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
+
 
 pkgver() {
        cd "${srcdir}/${_reponame}"

diff --git a/packaging/arch/PKGBUILD_theme_materia b/packaging/arch/PKGBUILD_theme_materia
@@ -48,7 +48,11 @@ options=(
        '!strip'
 )
 provides=($_pkgname)
-conflicts=($_pkgname)
+conflicts=(
+    $_pkgname
+    'oomox'
+    'oomox-git'
+)
 
 pkgver() {
        cd "${srcdir}/${_reponame}"

diff --git a/plugins/base16 b/plugins/base16
diff --git a/plugins/oomoxify b/plugins/oomoxify
diff --git a/plugins/theme_oomox b/plugins/theme_oomox