summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 038424aee137..7abcf28a2d23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jul 3 12:52:56 UTC 2017
+# Mon Jul 3 13:50:23 UTC 2017
pkgbase = fusiondirectory
pkgdesc = FusionDirectory is a combination of system-administrator and end-user web interface, designed to handle LDAP based setups.
pkgver = 1.2
@@ -33,6 +33,7 @@ pkgbase = fusiondirectory
depends = php-imap
depends = php-apache
depends = php-cas
+ conflicts = smarty3-i18n
backup = etc/fusiondirectory-apache.conf
source = http://repos.fusiondirectory.org/sources/1.0/fusiondirectory/fusiondirectory-1.2.tar.gz
source = fixes-path.patch
diff --git a/PKGBUILD b/PKGBUILD
index 7ca87153d340..b239b3dfaaed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,7 @@ depends=("apache" "smarty3" "smarty3-gettext" "prototype" "scriptaculous" "schem
"perl-crypt-cbc" "perl-file-copy-recursive" "perl-xml-twig" "perl-archive-extract" "perl-extutils-makemaker"
"php-imagick" "php-ldap" "php-pear" "php-gd" "php-imap" "php-apache" "php-cas")
install=${pkgname}.install
+conflicts=('smarty3-i18n')
backup=('etc/fusiondirectory-apache.conf')