From 9ff3bfa22f150db78c415175b91ae583a1b1ee6f Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Sat, 8 Dec 2018 12:26:38 -0500
Subject: [PATCH] PKGBUILDs: Merge tari-web with tari-core

Since anyone using Tari will probably want the web browsers too,
this change makes sense.

Since all of Tari is now in one PKGBUILD, it is easy to see everything
that will be installed, and it becomes trivial to add or remove packages
as needed.
---
 .archlinux/PKGBUILDs/tari-core/PKGBUILD         | 17 +++++++++++++++--
 .../{tari-web => tari-core}/local-settings.js   |  0
 .../{tari-web => tari-core}/mozilla.cfg         |  0
 .archlinux/PKGBUILDs/tari-web/PKGBUILD          | 17 -----------------
 4 files changed, 15 insertions(+), 19 deletions(-)
 rename .archlinux/PKGBUILDs/{tari-web => tari-core}/local-settings.js (100%)
 rename .archlinux/PKGBUILDs/{tari-web => tari-core}/mozilla.cfg (100%)
 delete mode 100644 .archlinux/PKGBUILDs/tari-web/PKGBUILD

diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
index 4123f44..a55755b 100644
--- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD
+++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=tari-core
-pkgver=0.6.0
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="My Arch Linux setup"
 arch=('any')
@@ -148,4 +148,17 @@ depends=(stow
          gnome-disk-utility
          gnome-screenshot
          gnome-weather
-         gnome-break-timer)
+         gnome-break-timer
+         firefox
+         chromium)
+source=(
+  'local-settings.js'
+  'mozilla.cfg'
+)
+sha256sums=('4588ae786cf0cdf941a0c79ad71b7592cd1f5478a85822b019d98ff0d5e631d4'
+            'c625a3b98b3769bf08fe0a357898245dd2688f3d5c22c7a42ad4fc26132f45a9')
+
+package() {
+  install -Dm644 local-settings.js   "$pkgdir"/usr/lib/firefox/defaults/pref/local-settings.js
+  install -Dm644 mozilla.cfg         "$pkgdir"/usr/lib/firefox/mozilla.cfg
+}
diff --git a/.archlinux/PKGBUILDs/tari-web/local-settings.js b/.archlinux/PKGBUILDs/tari-core/local-settings.js
similarity index 100%
rename from .archlinux/PKGBUILDs/tari-web/local-settings.js
rename to .archlinux/PKGBUILDs/tari-core/local-settings.js
diff --git a/.archlinux/PKGBUILDs/tari-web/mozilla.cfg b/.archlinux/PKGBUILDs/tari-core/mozilla.cfg
similarity index 100%
rename from .archlinux/PKGBUILDs/tari-web/mozilla.cfg
rename to .archlinux/PKGBUILDs/tari-core/mozilla.cfg
diff --git a/.archlinux/PKGBUILDs/tari-web/PKGBUILD b/.archlinux/PKGBUILDs/tari-web/PKGBUILD
deleted file mode 100644
index fe7c908..0000000
--- a/.archlinux/PKGBUILDs/tari-web/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=tari-web
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Web browser settings."
-arch=('any')
-depends=(firefox chromium)
-source=(
-  'local-settings.js'
-  'mozilla.cfg'
-)
-sha256sums=('4588ae786cf0cdf941a0c79ad71b7592cd1f5478a85822b019d98ff0d5e631d4'
-            'c625a3b98b3769bf08fe0a357898245dd2688f3d5c22c7a42ad4fc26132f45a9')
-
-package() {
-  install -Dm 644 local-settings.js   "$pkgdir"/usr/lib/firefox/defaults/pref/local-settings.js
-  install -Dm 644 mozilla.cfg         "$pkgdir"/usr/lib/firefox/mozilla.cfg
-}