added patch for libcal2 support by jplum

4 files changed, 39 insertions, 15 deletions

diff --git a/001-libical2_support.patch b/001-libical2_support.patch
new file mode 100644
index 000000000000..7e6ce55c93c0
--- /dev/null
+++ b/001-libical2_support.patch
@@ -0,0 +1,13 @@
+diff --git a/citadel/modules/calendar/serv_calendar.c b/citadel/modules/calendar/serv_calendar.c
+index 1504fcc..7e57b66 100644
+--- a/citadel/modules/calendar/serv_calendar.c
++++ b/citadel/modules/calendar/serv_calendar.c
+@@ -2586,7 +2586,7 @@ CTDL_MODULE_INIT(calendar)
+ 	{
+ 
+ 		/* Tell libical to return errors instead of aborting if it gets bad data */
+-		icalerror_errors_are_fatal = 0;
++		icalerror_set_errors_are_fatal(0);
+ 
+ 		/* Use our own application prefix in tzid's generated from system tzdata */
+ 		icaltimezone_set_tzid_prefix("/citadel.org/");
diff --git a/PKGBUILD b/PKGBUILD
index 3404b8e2a18f..10a8beab0c88 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,11 @@
 # Maintainer: nnnn20430 <nnnn20430@mindcraft.si.eu.org>
+# Contributor: Jason PLum <jplum@archlinuxarm.org>
+
 pkgname=citadel
+_gitname=citadel
 pkgver=v9.01.r0.ga845b4f
-pkgrel=1
+_gittag=v9.01
+pkgrel=2
 pkgdesc="Citadel/UX is a collaboration suite (messaging and groupware) that is descended from the Citadel family of programs which became popular in the 1980s and 1990s as a bulletin board system platform."
 arch=('i686' 'x86_64')
 url="http://www.citadel.org/"
@@ -11,26 +15,33 @@ makedepends=('git' 'libcitadel' 'libev' 'c-ares' 'curl' 'expat' 'libical' 'libsi
 optdepends=('openssl: SSL support' 'shared-mime-info: filetype identification')
 conflicts=()
 changelog=""
-source=("git://git.citadel.org/appl/gitroot/citadel.git" "citadel.service")
-install="citadel.install"
-md5sums=('SKIP' 'SKIP')
+source=("$_gitname::git://git.citadel.org/appl/gitroot/citadel.git#tag=$_gittag"
+        'citadel.service'
+        '001-libical2_support.patch')
+install="$pkgname.install"
+md5sums=('SKIP'
+         '1dad4ebec773f08de372d794ed16d214'
+         'ce32349cd9f646d41bb444c6cb47a033')
 
 pkgver() {
   cd "$srcdir/citadel"
-  git checkout v9.01
   git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "$srcdir/$_gitname"
+  git apply "$srcdir/001-libical2_support.patch"
+}
+
 build() {
-	cd "$srcdir/citadel/citadel"
-	./bootstrap
-        ./configure --prefix=/usr/local/citadel
-	make
+  cd "$srcdir/citadel/citadel"
+  ./bootstrap
+  ./configure --prefix=/usr/citadel
+  make
 }
 
 package() {
-        cd "$srcdir/citadel/citadel"
-        make DESTDIR="$pkgdir" install
-	mkdir -p "$pkgdir/usr/lib/systemd/system"
-	cp "$startdir/citadel.service" "$pkgdir/usr/lib/systemd/system/citadel.service"	
+  cd "$srcdir/citadel/citadel"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$srcdir/citadel.service" "$pkgdir/usr/lib/systemd/system/citadel.service"	
 }
diff --git a/citadel.install b/citadel.install
index d17c394572a4..f232667eb5e7 100644
--- a/citadel.install
+++ b/citadel.install
@@ -6,7 +6,7 @@ pre_install() {
 ## arg 1:  the new package version
 post_install() {
 	echo "run 'systemctl start citadel'"
-	echo "then run '/usr/local/citadel/setup' to configure citadel"
+	echo "then run '/usr/citadel/setup' to configure citadel"
 }
 
 ## arg 1:  the new package version
diff --git a/citadel.service b/citadel.service
index 77f6013ab448..9442bf419318 100644
--- a/citadel.service
+++ b/citadel.service
@@ -2,7 +2,7 @@
 Description=Citadel/UX Groupware
 
 [Service]
-ExecStart=/usr/local/citadel/citserver -d
+ExecStart=/usr/citadel/citserver -d
 Type=forking
 
 [Install]