[arch-commits] Commit in dokuwiki/repos/community-any (4 files)

Sergej Pupykin spupykin at archlinux.org
Sun Jul 19 11:55:15 UTC 2020


    Date: Sunday, July 19, 2020 @ 11:55:15
  Author: spupykin
Revision: 664563

archrelease: copy trunk to community-any

Added:
  dokuwiki/repos/community-any/PKGBUILD
    (from rev 664562, dokuwiki/trunk/PKGBUILD)
  dokuwiki/repos/community-any/apache.example.conf
    (from rev 664562, dokuwiki/trunk/apache.example.conf)
Deleted:
  dokuwiki/repos/community-any/PKGBUILD
  dokuwiki/repos/community-any/apache.example.conf

---------------------+
 PKGBUILD            |  132 +++++++++++++++++++++++++-------------------------
 apache.example.conf |   16 +++---
 2 files changed, 75 insertions(+), 73 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-19 11:55:07 UTC (rev 664562)
+++ PKGBUILD	2020-07-19 11:55:15 UTC (rev 664563)
@@ -1,65 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sébastien Luttringer
-
-pkgname=dokuwiki
-pkgver=20180422_c
-_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6}
-_pkgver=${_pkgver/_/}
-pkgrel=1
-pkgdesc='Simple to use and highly versatile Open Source wiki software'
-arch=('any')
-url='https://www.dokuwiki.org/'
-license=('GPL')
-depends=('php')
-backup=('etc/webapps/dokuwiki/.htaccess'
-        'etc/httpd/conf/extra/dokuwiki.conf')
-options=('!strip')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/splitbrain/dokuwiki/archive/release_stable_${_pkgver}.tar.gz"
-        'apache.example.conf')
-sha256sums=('92eea8b6be85afa1fb6852079d1395c5d405233a49bfac32ecb7e1d6fd9cb559'
-            '6d6f19b545ca98573761f522fa837a4d2d3de932d21e593ac882ef57b13f0bb1')
-
-package() {
-  cd "$pkgdir"
-  install -dm0755 usr/share/webapps var/lib/dokuwiki etc/webapps
-  cp -a "$srcdir"/$pkgname-release_stable_${_pkgver} usr/share/webapps/dokuwiki
-
-  # move data in var
-  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
-  ln -s ../../../../../etc/webapps/dokuwiki usr/share/webapps/dokuwiki/conf
-
-  # inform update on changes.log
-  touch var/lib/dokuwiki/data/changes.log
-  chmod 0644 var/lib/dokuwiki/data/changes.log
-
-  # use default htaccess
-  cp usr/share/webapps/dokuwiki/.htaccess.dist etc/webapps/dokuwiki/.htaccess
-  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 etc/httpd/conf/extra/dokuwiki.conf
-
-  # php.ini
-#  install -dm0755 "$pkgdir"/etc/php/conf.d/
-#  echo 'open_basedir = ${open_basedir}:/etc/webapps/dokuwiki/:/var/lib/dokuwiki/' >"$pkgdir"/etc/php/conf.d/dokuwiki.ini
-}
-
-# vim:set ts=2 sw=2 et:

Copied: dokuwiki/repos/community-any/PKGBUILD (from rev 664562, dokuwiki/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-19 11:55:15 UTC (rev 664563)
@@ -0,0 +1,67 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sébastien Luttringer
+
+pkgname=dokuwiki
+pkgver=20200609rc
+_pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6}
+_pkgver=${_pkgver/_/}
+_pkgver=${_pkgver/rc/}
+[[ $pkgver == *"rc" ]] && _release=candidate || _release=stable
+pkgrel=1
+pkgdesc='Simple to use and highly versatile Open Source wiki software'
+arch=('any')
+url='https://www.dokuwiki.org/'
+license=('GPL')
+depends=('php')
+backup=('etc/webapps/dokuwiki/.htaccess'
+        'etc/httpd/conf/extra/dokuwiki.conf')
+options=('!strip')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/splitbrain/dokuwiki/archive/release_${_release}_${_pkgver}.tar.gz"
+        'apache.example.conf')
+sha256sums=('4f6c75b7d4e1e5a652cc8d21d8800986b167cba89db20fb0b37c790eb8ff46fe'
+            '6d6f19b545ca98573761f522fa837a4d2d3de932d21e593ac882ef57b13f0bb1')
+
+package() {
+  cd "$pkgdir"
+  install -dm0755 usr/share/webapps var/lib/dokuwiki etc/webapps
+  cp -a "$srcdir"/$pkgname-release_${_release}_${_pkgver} usr/share/webapps/dokuwiki
+
+  # move data in var
+  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
+  ln -s ../../../../../etc/webapps/dokuwiki usr/share/webapps/dokuwiki/conf
+
+  # inform update on changes.log
+  touch var/lib/dokuwiki/data/changes.log
+  chmod 0644 var/lib/dokuwiki/data/changes.log
+
+  # use default htaccess
+  cp usr/share/webapps/dokuwiki/.htaccess.dist etc/webapps/dokuwiki/.htaccess
+  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 etc/httpd/conf/extra/dokuwiki.conf
+
+  # php.ini
+#  install -dm0755 "$pkgdir"/etc/php/conf.d/
+#  echo 'open_basedir = ${open_basedir}:/etc/webapps/dokuwiki/:/var/lib/dokuwiki/' >"$pkgdir"/etc/php/conf.d/dokuwiki.ini
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: apache.example.conf
===================================================================
--- apache.example.conf	2020-07-19 11:55:07 UTC (rev 664562)
+++ apache.example.conf	2020-07-19 11:55:15 UTC (rev 664563)
@@ -1,8 +0,0 @@
-Alias /dokuwiki /usr/share/webapps/dokuwiki
-<Directory /usr/share/webapps/dokuwiki/>
-    Options +FollowSymLinks
-    AllowOverride All
-    order allow,deny
-    allow from all
-    php_admin_value open_basedir "/tmp/:/usr/share/webapps/dokuwiki/:/etc/webapps/dokuwiki/:/var/lib/dokuwiki/"
-</Directory>

Copied: dokuwiki/repos/community-any/apache.example.conf (from rev 664562, dokuwiki/trunk/apache.example.conf)
===================================================================
--- apache.example.conf	                        (rev 0)
+++ apache.example.conf	2020-07-19 11:55:15 UTC (rev 664563)
@@ -0,0 +1,8 @@
+Alias /dokuwiki /usr/share/webapps/dokuwiki
+<Directory /usr/share/webapps/dokuwiki/>
+    Options +FollowSymLinks
+    AllowOverride All
+    order allow,deny
+    allow from all
+    php_admin_value open_basedir "/tmp/:/usr/share/webapps/dokuwiki/:/etc/webapps/dokuwiki/:/var/lib/dokuwiki/"
+</Directory>



More information about the arch-commits mailing list