summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlphaJack2020-11-03 22:31:00 +0100
committerAlphaJack2020-11-03 22:31:00 +0100
commit27b77ca599ceeda323a4e8a3604109824996b5dc (patch)
tree208184d6f6e3741018809c07d2a1e98461d82bda
parentb48940479d77fd6c5635de7a565d43619f0d8fea (diff)
downloadaur-27b77ca599ceeda323a4e8a3604109824996b5dc.tar.gz
Tidied PKGBUILD following dvzrv's suggestions
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD16
2 files changed, 14 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6a1b49eb809..31d84d8a7ba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,10 +6,10 @@ pkgbase = roundcubemail-plugin-carddav
arch = any
license = GPL2
makedepends = composer
- depends = roundcubemail
conflicts = roundcube-rcmcarddav
conflicts = roundcube-rcmcarddav-git
conflicts = roundcubemail-plugin-carddav-git
+ replaces = roundcube-rcmcarddav
backup = etc/webapps/roundcubemail/plugins/carddav/config.inc.php
source = https://github.com/blind-coder/rcmcarddav/releases/download/v4.0.1/carddav-v4.0.1.tgz
md5sums = e1b801837689eb18a1703265ee07ac91
diff --git a/PKGBUILD b/PKGBUILD
index 05203f341fc..80578e2bfa4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,19 +8,29 @@ url="https://github.com/blind-coder/rcmcarddav"
license=("GPL2")
arch=("any")
conflicts=("roundcube-rcmcarddav" "roundcube-rcmcarddav-git" "roundcubemail-plugin-carddav-git")
-depends=("roundcubemail")
+replaces=("roundcube-rcmcarddav")
+#depends=("roundcubemail")
makedepends=("composer")
source=("$url/releases/download/v$pkgver/carddav-v$pkgver.tgz")
md5sums=("e1b801837689eb18a1703265ee07ac91")
backup=("etc/webapps/roundcubemail/plugins/carddav/config.inc.php")
-package() {
+prepare(){
cd "carddav"
+ # Waiting for https://github.com/blind-coder/rcmcarddav/pull/312 to be released
sed -i 's|"dealerdirect/phpcodesniffer-composer-installer": "^0.6.0"|"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0"|' "composer.json"
+}
+
+build(){
+ cd "carddav"
composer install --no-interaction --no-dev
+}
+
+package(){
+ cd "carddav"
install -d "$pkgdir/usr/share/webapps/roundcubemail/plugins/carddav"
cp -r * "$pkgdir/usr/share/webapps/roundcubemail/plugins/carddav"
install -D -m 644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
- install -D -o root -g http -m 640 "config.inc.php.dist" "$pkgdir/etc/webapps/roundcubemail/plugins/carddav/config.inc.php"
+ install -D -m 640 -o root -g http "config.inc.php.dist" "$pkgdir/etc/webapps/roundcubemail/plugins/carddav/config.inc.php"
ln -s "/etc/webapps/roundcubemail/plugins/carddav/config.inc.php" "$pkgdir/usr/share/webapps/roundcubemail/plugins/carddav/config.inc.php"
}