summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7eba6d4bf13..2fcfd6e1cb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ice-ssb-git
pkgdesc = Desktop integration for webapps
pkgver = 6.0.8.r26.499b891
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/peppermintos/ice
arch = any
license = GPL2
@@ -16,7 +16,9 @@ pkgbase = ice-ssb-git
optdepends = google-chrome
optdepends = vivaldi
provides = ice-ssb
+ provides = ice
conflicts = ice-ssb
+ conflicts = ice
source = git+https://github.com/peppermintos/ice.git
source = ice.patch
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d48e9a5ae80..ff7e6caacc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,15 @@ pkgver() {
git -C "$_pkgname" describe --tags | sed 's/v\?\([^-]\+\)-/\1.r/;s/-g/./'
}
pkgver=6.0.8.r26.499b891
-pkgrel=1
+pkgrel=2
pkgdesc='Desktop integration for webapps'
url="https://github.com/peppermintos/$_pkgname"
arch=('any')
license=('GPL2')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("${pkgname%-git}" "$_pkgname")
+conflicts=("${pkgname%-git}" "$_pkgname")
makedepends=('git')
depends=('python-requests' 'python-beautifulsoup4' 'python-gobject' 'python-lxml')
@@ -30,14 +30,14 @@ sha256sums=('SKIP'
prepare() {
cd "$_pkgname"
# patch browser binary filenames to match Archlinux packages
- patch -Np1 <"../$_pkgname.patch"
+ patch --no-backup-if-mismatch -Np1 <"../$_pkgname.patch"
# delete PeppermintOS specific assets
rm -r usr/lib
}
package() {
cd "$_pkgname"
- cp -a --no-preserve=ownership usr "$pkgdir/"
+ cp -a --no-preserve=o usr "$pkgdir/"
install -Dm644 README.md -t"$pkgdir/usr/share/doc/$_pkgname/"
}