summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSébastien Leduc2017-10-27 17:43:47 +0200
committerSébastien Leduc2017-10-27 17:43:47 +0200
commit2e7b594bb108812722ab7052408880422cf2b297 (patch)
treefc9d241c0d2f159c4a2f1c11e023497f19bbdac5
parentbe718cf7213ea2ab6dd2ecdc7bcfff4b177c5a68 (diff)
downloadaur-2e7b594bb108812722ab7052408880422cf2b297.tar.gz
Bump to 0.10.4.
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD17
-rw-r--r--rdiffweb.install7
-rw-r--r--rdiffweb.service8
4 files changed, 26 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3aee0ca80a6a..64486b8cae8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,11 @@
+# Generated by mksrcinfo v8
+# ven. oct. 27 15:43:02 UTC 2017
pkgbase = rdiffweb
pkgdesc = Web interface for browsing and restoring from rdiff-backup repositories.
- pkgver = 0.7.0
- pkgrel = 2
+ pkgver = 0.10.4
+ pkgrel = 1
url = http://www.rdiffweb.org/wiki/index.php?title=Main_Page
+ install = rdiffweb.install
arch = any
license = GPL
depends = python2
@@ -11,15 +14,14 @@ pkgbase = rdiffweb
depends = python2-jinja
depends = python2-setuptools
depends = python2-babel
+ depends = python2-future
depends = rdiff-backup
optdepends = pyopenssl: for https support
backup = etc/rdiffweb/rdw.conf
- source = https://github.com/ikus060/rdiffweb/archive/v0.7.0.tar.gz
- source = setup.py.patch
+ source = https://github.com/ikus060/rdiffweb/archive/0.10.4.tar.gz
source = rdiffweb.service
- sha256sums = 0c374524f770e44af8a4176447a1cc4e6bb83bf8bac825275b90cd94e6119243
- sha256sums = 52c796cb96a70184dbcab6de079fae87232e50f33f100ba83946764e85741de1
- sha256sums = cb70f474dabbcb9f1f52ffd11158ab66068e0edf6313589ee523524e796fb455
+ sha256sums = 09a70ef812a12da8376a3a5f687c8e053408a18b4757c05736ee4797cc337bad
+ sha256sums = 0e17c15c1cb8b6f12e98e9b28b8083f62371a5284a68a626bb14266129ec193d
pkgname = rdiffweb
diff --git a/PKGBUILD b/PKGBUILD
index 003c63dc20c1..fcd13109c64f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,24 @@
# Maintainer: Sebastien Leduc <sebastien@sleduc.fr>
# Contributor: Thomas Haider <t.haider@vcnc.org>"
pkgname=rdiffweb
-pkgver=0.7.0
-pkgrel=2
+pkgver=0.10.4
+pkgrel=1
pkgdesc="Web interface for browsing and restoring from rdiff-backup repositories."
arch=(any)
url="http://www.rdiffweb.org/wiki/index.php?title=Main_Page"
license=('GPL')
-depends=('python2' 'python2-cherrypy' 'python2-pysqlite' 'python2-jinja' 'python2-setuptools' 'python2-babel' 'rdiff-backup')
+depends=('python2' 'python2-cherrypy' 'python2-pysqlite' 'python2-jinja' 'python2-setuptools' 'python2-babel' 'python2-future' 'rdiff-backup')
optdepends=('pyopenssl: for https support')
-source=("https://github.com/ikus060/$pkgname/archive/v$pkgver.tar.gz"
- "setup.py.patch"
+source=("https://github.com/ikus060/$pkgname/archive/$pkgver.tar.gz"
"$pkgname.service")
+install=rdiffweb.install
backup=('etc/rdiffweb/rdw.conf')
-sha256sums=('0c374524f770e44af8a4176447a1cc4e6bb83bf8bac825275b90cd94e6119243'
- '52c796cb96a70184dbcab6de079fae87232e50f33f100ba83946764e85741de1'
- 'cb70f474dabbcb9f1f52ffd11158ab66068e0edf6313589ee523524e796fb455')
+sha256sums=('09a70ef812a12da8376a3a5f687c8e053408a18b4757c05736ee4797cc337bad'
+ '0e17c15c1cb8b6f12e98e9b28b8083f62371a5284a68a626bb14266129ec193d')
package() {
cd "$srcdir/$pkgname-$pkgver"
- patch -p0 -i ../setup.py.patch
-
python2 setup.py build
python2 setup.py install --prefix=/usr --root="$pkgdir"
diff --git a/rdiffweb.install b/rdiffweb.install
new file mode 100644
index 000000000000..1a08cfccd651
--- /dev/null
+++ b/rdiffweb.install
@@ -0,0 +1,7 @@
+post_upgrade() {
+ echo "WARNING: Database format change on this version."
+ echo "You will have to remove /etc/rdiffweb/rdw.db and let rdiffweb re-create it, and recreate your accounts."
+ echo "Or you will have to migrate the database manually."
+ echo "The same goes with the configuration file that has to be carefully merged."
+}
+
diff --git a/rdiffweb.service b/rdiffweb.service
index 7e4c7a1b8d19..2435a26bed45 100644
--- a/rdiffweb.service
+++ b/rdiffweb.service
@@ -1,12 +1,10 @@
[Unit]
-Description=Web interface for rdiff-backup
+Description=Rdiffweb Server
+Documentation=http://www.patrikdufresne.com/en/rdiffweb/
After=network.target
[Service]
-Type=forking
-ExecStart=/usr/bin/rdiffweb --pid-file=/run/rdiffweb.pid -d --background
-ExecStartPre=/bin/rm -f /run/rdiffweb.pid
-PIDFile=/run/rdiffweb.pid
+ExecStart=/usr/bin/rdiffweb
[Install]
WantedBy=multi-user.target