Date: Thursday, May 29, 2014 @ 15:22:26 Author: speps Revision: 112169
upgpkg: libircclient 1.8-1 Modified: libircclient/trunk/PKGBUILD Deleted: libircclient/trunk/shared.patch --------------+ PKGBUILD | 40 +++++++++++++++++++++------------------- shared.patch | 44 -------------------------------------------- 2 files changed, 21 insertions(+), 63 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-29 12:37:06 UTC (rev 112168) +++ PKGBUILD 2014-05-29 13:22:26 UTC (rev 112169) @@ -1,32 +1,30 @@ # $Id$ -# Maintainer: SpepS <dreamspepser at yahoo dot it> +# Maintainer: speps <speps at aur dot archlinux dot org> # Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> # Contributor: Marcel Wysocki <m...@satgnu.net> # Contributor: coolkehon <coolkehon at g m a i l> pkgname=libircclient -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc='Small but powerful library, which implements client-server IRC protocol' arch=('i686' 'x86_64') url='http://www.ulduzsoft.com/libircclient/' +license=('GPL') depends=('glibc') makedepends=('python2-sphinx' 'python2-rst2pdf') -license=('GPL') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('968370276f7cf21302f504f9bce1fc99') +md5sums=('a1b4fd5491a36b8aedf65a6845755800') +prepare() { + cd $pkgname-$pkgver/src + + # fix include dir path + sed -i "s/@\/include/&\/$pkgname/" Makefile.in +} + build() { cd $pkgname-$pkgver - - # add fPIC flag for x86_64 - [[ "$CARCH" = "x86_64" ]] && export CFLAGS="$CFLAGS -fPIC" - - sed -e "/install/s/lib/all/" \ - -e "/DESTDIR/s/\.a/\.so/g" \ - -e "s/@\/include/&\/$pkgname/" \ - -i src/Makefile.in - ./configure --prefix=/usr \ --libdir=/usr/lib \ --enable-shared @@ -33,8 +31,7 @@ cd src && make cd ../doc - sed -i 's/sphinx-build/sphinx-build2/g' Makefile - make singlehtml man + make SPHINXBUILD=sphinx-build2 singlehtml man } package() { @@ -41,11 +38,16 @@ cd $pkgname-$pkgver/src make DESTDIR="$pkgdir" install - install -d "$pkgdir"/usr/share/doc/$pkgname - cp -a ../doc/_build/singlehtml/* "$pkgdir"/usr/share/doc/$pkgname - cp -a ../doc/_build/man "$pkgdir"/usr/share + # docs + install -d "$pkgdir/usr/share/doc/$pkgname" + cp -a ../doc/_build/singlehtml/* "$pkgdir/usr/share/doc/$pkgname" - install -d "$pkgdir"/usr/share/$pkgname/examples + # man + install -Dm644 ../doc/_build/man/$pkgname.1 \ + "$pkgdir/usr/share/man/man1/$pkgname.1" + + # examples + install -d "$pkgdir/usr/share/$pkgname/examples" install -Dm644 ../examples/* \ "$pkgdir"/usr/share/$pkgname/examples } Deleted: shared.patch =================================================================== --- shared.patch 2014-05-29 12:37:06 UTC (rev 112168) +++ shared.patch 2014-05-29 13:22:26 UTC (rev 112169) @@ -1,44 +0,0 @@ -diff -aur libircclient-1.3/src/Makefile.in libircclient-1.3.patched/src/Makefile.in ---- libircclient-1.3/src/Makefile.in 2005-03-09 22:11:53.000000000 +0100 -+++ libircclient-1.3.patched/src/Makefile.in 2012-01-05 05:46:21.000000000 +0100 -@@ -4,21 +4,22 @@ - AR=@AR@ cr - RANLIB=@RANLIB@ - INCLUDES=-I../include -- -+DESTDIR+= - - OBJS = libircclient.o - - all: lib - --lib: libircclient.a -+lib: libircclient.a libircclient.so - - install: lib -- -mkdir @prefix@/include -- -mkdir @prefix@/lib -- cp ../include/libircclient.h @prefix@/include/libircclient.h -- cp ../include/libirc_errors.h @prefix@/include/libirc_errors.h -- cp ../include/libirc_events.h @prefix@/include/libirc_events.h -- cp libirc.a @prefix@/include/lib/libirc.a -+ mkdir -p $(DESTDIR)/usr/{lib,include/libircclient} -+ mkdir -p $(DESTDIR)/usr/share/{man,{doc,}/libircclient} -+ cp libircclient.a libircclient.so $(DESTDIR)/usr/lib -+ cp ../include/libirc*.h $(DESTDIR)/usr/include/libircclient -+ cp -a ../doc/{html,rfc1459.txt} $(DESTDIR)/usr/share/doc/libircclient -+ cp -a ../examples $(DESTDIR)/usr/share/libircclient -+ cp -a ../doc/man/man3 $(DESTDIR)/usr/share/man - - $(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c - -@@ -26,6 +27,9 @@ - $(AR) libircclient.a $(OBJS) - $(RANLIB) libircclient.a - -+libircclient.so: $(OBJS) -+ $(CC) -shared -Wl $(OBJS) -o libircclient.so -+ - clean: - rm -f libircclient.a $(OBJS) -