[arch-commits] Commit in dokuwiki/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Wednesday, December 11, 2013 @ 23:24:46
  Author: seblu
Revision: 102474

upgpkg: dokuwiki 20131208-1

- Remove rc release logic (we don't release RC)
- Move volatile stuff back to /var (FS#36433 is not confirmed)
- Move apache example to apache extra conf directory and backup it
- Update upstream URL

Modified:
  dokuwiki/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-11 19:52:54 UTC (rev 102473)
+++ PKGBUILD	2013-12-11 22:24:46 UTC (rev 102474)
@@ -3,21 +3,20 @@
 # Contributor: Sébastien Luttringer
 
 pkgname=dokuwiki
-pkgver=20131028.rc
-[ "x${pkgver:9:2}" == "xrc" ] && \
-  _pkgver=rc${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2} || \
-  _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}${pkgver:9:1}
+pkgver=20131208
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
 pkgrel=1
 pkgdesc='Simple to use and highly versatile Open Source wiki software'
 arch=('any')
-url='http://www.splitbrain.org/projects/dokuwiki'
+url='https://www.dokuwiki.org/'
 license=('GPL')
 depends=('php')
-backup=('etc/webapps/dokuwiki/.htaccess')
+backup=('etc/webapps/dokuwiki/.htaccess'
+        'etc/httpd/conf/extra/dokuwiki.conf')
 options=('!strip')
-source=("http://download.dokuwiki.org/src/dokuwiki/dokuwiki-${_pkgver}.tgz"
-	"apache.example.conf")
-md5sums=('f476b54a3679d35cdd8746db57c9c6a3'
+source=("http://download.dokuwiki.org/src/dokuwiki/dokuwiki-$_pkgver.tgz"
+        'apache.example.conf')
+md5sums=('620b7fed511e643ad05ad13207baa502'
          'c5bed40abf5bb737bad8df29bb7020dc')
 
 package() {
@@ -29,6 +28,14 @@
   mv usr/share/webapps/dokuwiki/data var/lib/dokuwiki
   ln -s {../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki}/data
 
+  # move plugins in var
+  mv usr/share/webapps/dokuwiki/lib/plugins var/lib/dokuwiki
+  ln -s {../../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki/lib}/plugins
+
+  # move templates in var
+  mv usr/share/webapps/dokuwiki/lib/tpl var/lib/dokuwiki
+  ln -s {../../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki/lib}/tpl
+
   # move config in /etc
   mv usr/share/webapps/dokuwiki/conf etc/webapps/dokuwiki
   chmod g=rwx etc/webapps/dokuwiki
@@ -43,11 +50,12 @@
   ln -s /etc/webapps/dokuwiki/.htaccess usr/share/webapps/dokuwiki/.htaccess
 
   # fix rights and ownership
+  chown http:http var/lib/dokuwiki/plugins
   chown -R http:http var/lib/dokuwiki/data
   chown -R http:http etc/webapps/dokuwiki
 
   # apache config
-  install -Dm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/dokuwiki/apache.example.conf
+  install -Dm0644 "$srcdir"/apache.example.conf etc/httpd/conf/extra/dokuwiki.conf
 }
 
 # vim:set ts=2 sw=2 et: