diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-14 16:10:04 +0100 |
commit | 96f47f7059e8ad389d0aa757b2c66ad7cd8daf74 (patch) | |
tree | f107c3838373376ef130dcfcb5a980cf8ad30a5f /community/rsyslog | |
parent | 40ece75655aebe0dd951a0489ed2111f1c27f8a8 (diff) | |
parent | 3ff20dedff636571ad0faa4736af5b23e4623ffe (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cantata/PKGBUILD
community/gpsmanshp/PKGBUILD
community/pigz/PKGBUILD
extra/calligra/PKGBUILD
extra/genius/PKGBUILD
extra/gnumeric/PKGBUILD
extra/goffice/PKGBUILD
extra/graphicsmagick/PKGBUILD
extra/libgphoto2/PKGBUILD
extra/python-numpy/PKGBUILD
Diffstat (limited to 'community/rsyslog')
-rw-r--r-- | community/rsyslog/PKGBUILD | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 302029262..af15f8193 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 85988 2013-03-10 20:14:44Z spupykin $ +# $Id: PKGBUILD 86155 2013-03-12 13:29:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.6 -pkgrel=1 +pkgrel=4 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') depends=('zlib' 'libestr' 'libee' 'json-c') -makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls') +makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls') optdepends=('postgresql-libs: PostgreSQL Database Support' - 'libmariadbclient: MySQL Database Support' + 'libmysqlclient: MySQL Database Support' 'net-snmp' 'gnutls') backup=('etc/rsyslog.conf' @@ -46,7 +46,7 @@ package() { make install DESTDIR=${pkgdir} # Install Daemons and Configuration Files install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d - install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/etc/${pkgname}.conf + install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} |