[arch-commits] Commit in redis/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Tuesday, September 24, 2013 @ 12:29:54
  Author: spupykin
Revision: 97558

upgpkg: redis 2.6.16-2

upd

Modified:
  redis/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-24 10:13:29 UTC (rev 97557)
+++ PKGBUILD	2013-09-24 10:29:54 UTC (rev 97558)
@@ -5,7 +5,7 @@
 
 pkgname=redis
 pkgver=2.6.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -27,12 +27,15 @@
 prepare() {
   cd "$srcdir/${pkgname}-${pkgver}"
   sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf
+  sed -i 's|daemonize no|daemonize yes|' redis.conf
+  sed -i 's|dir \./|dir /var/lib/redis/|' redis.conf
   sed -i 's|pidfile .*|pidfile /run/redis/redis.pid|' redis.conf
+  sed -i 's|logfile stdout|logfile /var/log/redis.log|' redis.conf
 }
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
-  make MALLOC=libc
+  make
 }
 
 package() {
@@ -40,10 +43,9 @@
   mkdir -p $pkgdir/usr/bin
   make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install
 
-  install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
+  install -Dm755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING"
   install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
   install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
-  sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf
-  install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
   install -Dm644 "$srcdir/redis.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/redis.conf"
 }