radicale-1.0.1-2: updating version

3 files changed, 42 insertions, 10 deletions

diff --git a/pcr/radicale/PKGBUILD b/pcr/radicale/PKGBUILD
index 3f735ac3d..e2830ff43 100644
--- a/pcr/radicale/PKGBUILD
+++ b/pcr/radicale/PKGBUILD
@@ -1,38 +1,48 @@
 # Maintainer (Arch): Moritz Lipp <mlq@pwmt.org>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 pkgname=radicale
-pkgver=0.10
-pkgrel=1.1
+_pkgname=Radicale
+pkgver=1.0.1
+pkgrel=2
 pkgdesc="A Simple Calendar Server"
 arch=any
 url="http://www.radicale.org/"
 license=('GPL3')
 depends=('python>=3.2')
+makedepends=('python-setuptools')
 backup=('etc/radicale/config')
 install='radicale.install'
 source=(
 	http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz
+  radicale-$pkgver.patch
 	radicale.service
   radicale.install
 )
-md5sums=('32655d8893962956ead0ad690cca6044'
-         '62af2e07ad32a0fcece32fae68e92daf'
+md5sums=('e29e51df14bc8ca5a580998d5d592285'
+         '7d6a8ecdcb02f43780d106d8946338b3'
+         'f3abb0343e66a4045128b93184205d3e'
          '5613eec93efc5ef2ef68abd124fb6b61')
 optdepends=(
-  'python-pam: For PAM authentication' 
+  'python-pam: For PAM authentication'
   'python-requests: For HTTP authentication'
   'python-ldap: For LDAP authentication'
   )
 
+prepare() {
+  cd $srcdir/$_pkgname-$pkgver
+
+  patch -p1 < $startdir/$pkgname-$pkgver.patch
+}
+
 package() {
-  cd "$srcdir/Radicale-$pkgver"
+  cd $srcdir/$_pkgname-$pkgver
   python setup.py install --prefix=/usr --root="$pkgdir"
 
-  install -m644 -D "$srcdir/Radicale-$pkgver/config" "$pkgdir/etc/radicale/config"
+  install -m644 -D "$srcdir/$_pkgname-$pkgver/config" "$pkgdir/etc/radicale/config"
   install -m644 -D "$srcdir/radicale.service" "$pkgdir/usr/lib/systemd/system/radicale.service"
 
-  install -m644 -D "$srcdir/Radicale-$pkgver/radicale.fcgi" \
+  install -m644 -D "$srcdir/$_pkgname-$pkgver/radicale.fcgi" \
     "$pkgdir/usr/share/$pkgname/radicale.fcgi"
-  install -m644 -D "$srcdir/Radicale-$pkgver/radicale.wsgi" \
+  install -m644 -D "$srcdir/$_pkgname-$pkgver/radicale.wsgi" \
     "$pkgdir/usr/share/$pkgname/radicale.wsgi"
 }
diff --git a/pcr/radicale/radicale-1.0.1.patch b/pcr/radicale/radicale-1.0.1.patch
new file mode 100644
index 000000000..be94195e7
--- /dev/null
+++ b/pcr/radicale/radicale-1.0.1.patch
@@ -0,0 +1,22 @@
+diff --git a/config b/config
+index a2e36ec..66e5a25 100644
+--- a/config
++++ b/config
+@@ -146,7 +146,7 @@
+ #custom_handler =
+ 
+ # File for rights management from_file
+-#file = ~/.config/radicale/rights
++file = /etc/radicale/rights
+ 
+ 
+ [storage]
+@@ -163,7 +163,7 @@
+ #custom_handler =
+ 
+ # Folder for storing local collections, created if not present
+-#filesystem_folder = ~/.config/radicale/collections
++filesystem_folder = /var/lib/radicale/collections
+ 
+ # Database URL for SQLAlchemy
+ # dialect+driver://user:password@host/dbname[?key=value..]
diff --git a/pcr/radicale/radicale.service b/pcr/radicale/radicale.service
index 490904d7b..5dc4065e8 100644
--- a/pcr/radicale/radicale.service
+++ b/pcr/radicale/radicale.service
@@ -4,7 +4,7 @@ After=syslog.target network.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/radicale -f
+ExecStart=/usr/bin/radicale
 User=radicale
 Group=radicale