PKGBUILD: Upgrading to 3.0.0. Explicitely installing files (apart from vendor directory) and making things more FHS compliant.

Updating to correct license (GPL2). Installing docs to /usr/share/doc/ subdirectory.

2 files changed, 52 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6f2f2063ed3..2ce2144bbc7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
-# Generated by mksrcinfo v8
-# Tue Oct 24 23:59:03 UTC 2017
 pkgbase = roundcube-rcmcarddav
 	pkgdesc = CardDAV plugin for RoundCube Webmailer
-	pkgver = 2.0.4
-	pkgrel = 2
+	pkgver = 3.0.0
+	pkgrel = 1
 	url = https://github.com/blind-coder/rcmcarddav
 	arch = any
-	license = GPL
+	license = GPL2
 	depends = roundcubemail
 	backup = etc/webapps/roundcubemail/plugins/carddav/config.inc.php
-	source = https://github.com/blind-coder/rcmcarddav/releases/download/v2.0.4/carddav-2.0.4.tar.bz2
-	sha512sums = a9eeb5ef324872d02988abc89297e2d545baa8ad6734eb342b40418322489b8e6253a1d8397141edbf6055345cdbf1f170c6965ef24075f8ec9da26fe1d01a5b
+	source = https://github.com/blind-coder/rcmcarddav/releases/download/v3.0.0/carddav-3.0.0.tar.bz2
+	sha512sums = a9e87ebc747485f3c5804c95be2e09287597cf4acc729d1b774d6f4d9b16274658f5833b66a9fab1038ad334c7b7d19b9449f16f2e5f02e0d17c9f2e322f13e7
 
 pkgname = roundcube-rcmcarddav
 
diff --git a/PKGBUILD b/PKGBUILD
index 5752ad79ec7f..8d16cf9a7562 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,58 @@
-# Maintainer David Runge <dave@sleepmap.de>
-# Contributor Stefan Tatschner <stefan@sevenbyte.org>
+# Maintainer: David Runge <dave@sleepmap.de>
+# Contributor: Stefan Tatschner <stefan@sevenbyte.org>
 
 pkgname=roundcube-rcmcarddav
 _plugin_name=rcmcarddav
-_internal_name=carddav
-pkgver=2.0.4
-pkgrel=2
+_name=carddav
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="CardDAV plugin for RoundCube Webmailer"
 arch=('any')
 url="https://github.com/blind-coder/rcmcarddav"
-license=('GPL')
+license=('GPL2')
 depends=('roundcubemail')
-backup=("etc/webapps/roundcubemail/plugins/${_internal_name}/config.inc.php")
-source=("https://github.com/blind-coder/${_plugin_name}/releases/download/v${pkgver}/${_internal_name}-${pkgver}.tar.bz2")
-sha512sums=('a9eeb5ef324872d02988abc89297e2d545baa8ad6734eb342b40418322489b8e6253a1d8397141edbf6055345cdbf1f170c6965ef24075f8ec9da26fe1d01a5b')
+backup=("etc/webapps/roundcubemail/plugins/${_name}/config.inc.php")
+source=("https://github.com/blind-coder/${_plugin_name}/releases/download/v${pkgver}/${_name}-${pkgver}.tar.bz2")
+sha512sums=('a9e87ebc747485f3c5804c95be2e09287597cf4acc729d1b774d6f4d9b16274658f5833b66a9fab1038ad334c7b7d19b9449f16f2e5f02e0d17c9f2e322f13e7')
 
-package() {
-  # create directories for plugin and config
-  mkdir -p "${pkgdir}"/{usr/share,etc}/webapps/roundcubemail/plugins/"${_internal_name}"
-
-  # copy all files to plugin directory
-  cp -ra "${_internal_name}/"* ${pkgdir}/usr/share/webapps/roundcubemail/plugins/"${_internal_name}"
+prepare() {
+  mv -v "${_name}" "${pkgname}-${pkgver}"
+}
 
-  # copy config and symlink it
-  cp "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_internal_name}/config.inc.php.dist" \
+package() {
+  cd "${pkgname}-${pkgver}"
+  # php and xml
+  install -vDm 644 *.{php,xml} \
+    -t "${pkgdir}"/usr/share/webapps/roundcubemail/plugins/"${_name}"
+  install -vDm 644 skins/classic/*.css -t \
+    "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/skins/classic/"
+  # css
+  install -vDm 644 skins/larry/*.css \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/skins/larry/"
+  install -vDm 644 localization/*.inc \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/localization/"
+  # db migrations
+  install -vDm 644 dbmigrations/0000-dbinit/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0000-dbinit"
+  install -vDm 644 dbmigrations/0000-sample/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0000-sample"
+  install -vDm 644 dbmigrations/0001-categories/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0001-categories"
+  install -vDm 644 dbmigrations/0002-increasetextfieldlengths/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0002-increasetextfieldlengths"
+  install -vDm 644 dbmigrations/0003-fixtimestampdefaultvalue/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0003-fixtimestampdefaultvalue"
+  install -vDm 644 dbmigrations/0004-fixtimestampdefaultvalue/*.sql \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/dbmigrations/0004-fixtimestampdefaultvalue"
+  # copy vendor files to plugin directory
+  cp -av vendor \
+    -t "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/"
+  # configuration
+  install -vDm 644 config.inc.php.dist \
     "${pkgdir}/etc/webapps/roundcubemail/plugins/carddav/config.inc.php"
-  ln -s "/etc/webapps/roundcubemail/plugins/${_internal_name}/config.inc.php" \
-    "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_internal_name}/config.inc.php"
+  ln -sv "/etc/webapps/roundcubemail/plugins/${_name}/config.inc.php" \
+    "${pkgdir}/usr/share/webapps/roundcubemail/plugins/${_name}/config.inc.php"
+  # docs
+  install -vDm 644 {ChangeLog,README.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}/"
 }