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

[Dave Reisner]

    Date: Saturday, October 20, 2012 @ 16:58:22
  Author: dreisner
Revision: 169421

upgpkg: bitlbee 3.0.6-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-20 19:15:57 UTC (rev 169420)
+++ PKGBUILD	2012-10-20 20:58:22 UTC (rev 169421)
@@ -8,8 +8,8 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=4
+pkgver=3.0.6
+pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
 url='http://www.bitlbee.org/'
 license=('GPL')
@@ -20,12 +20,10 @@
             'libotr: for OTR encryption support'
             'xinetd: to run bitlbee through xinetd')
 source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'sbindir.patch'
         'xinetd'
         'rc.d'
         'bitlbee.tmpfiles')
-sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
-          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
+sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c'
           '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
           '02423c500ac64f673ba26a3395c7c7036c17343e'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
@@ -37,8 +35,6 @@
 build() { 
 	cd "$pkgname-$pkgver"
 
-	patch -p1 -i ../sbindir.patch
-
 	./configure \
 		--prefix=/usr \
 		--etcdir=/etc/bitlbee \

Deleted: sbindir.patch
===================================================================
--- sbindir.patch	2012-10-20 19:15:57 UTC (rev 169420)
+++ sbindir.patch	2012-10-20 20:58:22 UTC (rev 169421)
@@ -1,14 +0,0 @@
-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: