[arch-commits] Commit in bitlbee/trunk (PKGBUILD sbindir.patch)

[Gaetan Bisson]

    Date: Monday, February 20, 2012 @ 02:58:09
  Author: bisson
Revision: 150686

fix FS#28534

Added:
  bitlbee/trunk/sbindir.patch
Modified:
  bitlbee/trunk/PKGBUILD

---------------+
 PKGBUILD      |   10 +++++++---
 sbindir.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-20 07:56:26 UTC (rev 150685)
+++ PKGBUILD	2012-02-20 07:58:09 UTC (rev 150686)
@@ -8,7 +8,7 @@
 
 pkgname=bitlbee
 pkgver=3.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -19,9 +19,11 @@
             'libotr: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-	'xinetd'
-	'rc.d')
+        'sbindir.patch'
+        'xinetd'
+        'rc.d')
 sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
+          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           'be09d29af3853825778331df451f16ca9e452d03')
 
@@ -31,6 +33,8 @@
 build() { 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
+	patch -p1 -i ../sbindir.patch
+
 	./configure \
 		--prefix=/usr \
 		--etcdir=/etc/bitlbee \

Added: sbindir.patch
===================================================================
--- sbindir.patch	                        (rev 0)
+++ sbindir.patch	2012-02-20 07:58:09 UTC (rev 150686)
@@ -0,0 +1,14 @@
+diff -aur old/Makefile new/Makefile
+--- old/Makefile	2012-02-18 21:55:09.000000000 +1100
++++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
+@@ -135,8 +135,8 @@
+ 
+ systemd:
+ ifdef SYSTEMDSYSTEMUNITDIR
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
+-	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
++	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee at .service.in > init/bitlbee at .service
+ endif
+ 
+ install-systemd: