[arch-commits] Commit in libarchive/trunk (PKGBUILD no_uudecode.patch)

[Dan McGee]

    Date: Tuesday, July 15, 2008 @ 21:29:27
  Author: dan
Revision: 5444

upgpkg: libarchive 2.5.5-1

Modified:
  libarchive/trunk/PKGBUILD
Deleted:
  libarchive/trunk/no_uudecode.patch

-------------------+
 PKGBUILD          |   16 ++++++----------
 no_uudecode.patch |   11 -----------
 2 files changed, 6 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-16 01:27:57 UTC (rev 5443)
+++ PKGBUILD	2008-07-16 01:29:27 UTC (rev 5444)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 pkgname=libarchive
-pkgver=2.4.17
+pkgver=2.5.5
 pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=(i686 x86_64)
@@ -10,18 +10,16 @@
 license=('BSD')
 groups=('base')
 depends=('zlib' 'bzip2' 'acl')
-source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz
-        no_uudecode.patch)
+source=(http://people.freebsd.org/~kientzle/libarchive/src/libarchive-$pkgver.tar.gz)
+md5sums=('ff6387de3a3830785b229d1e1f11f523')
 
-# The libarchive .a static lib isn't linked correctly, so pacman.static
-#   build fails unless we keep the libtool files
-#options=(!libtool)
+# pacman.static build fails unless we keep the libtool files (or unless we link
+# the missing symbols inside the libarchive .a static lib, but that is dirty)
+options=(libtool)
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr
-  # patch out the parts that require uudecode (from sharutils, in extra)
-  patch -Np0 < ../no_uudecode.patch
 
   make || return 1
   make DESTDIR=$startdir/pkg install
@@ -31,5 +29,3 @@
   install -m644 COPYING $startdir/pkg/usr/share/licenses/libarchive/
 }
 
-md5sums=('13a6dd5f21b08713dccdd6489685fe77'
-         '5f159da70a1e09417d9599f43c9e19e2')

Deleted: no_uudecode.patch
===================================================================
--- no_uudecode.patch	2008-07-16 01:27:57 UTC (rev 5443)
+++ no_uudecode.patch	2008-07-16 01:29:27 UTC (rev 5444)
@@ -1,11 +0,0 @@
---- Makefile.old	2008-03-24 07:02:35.000000000 -0500
-+++ Makefile	2008-03-24 07:02:53.000000000 -0500
-@@ -458,7 +458,7 @@
- #
- lib_LTLIBRARIES = libarchive.la
- man_MANS = $(libarchive_man_MANS) $(bsdtar_man_MANS) $(bsdcpio_man_MANS)
--BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h $(libarchive_test_REFFILES) $(bsdcpio_test_REFFILES)
-+BUILT_SOURCES = libarchive/test/list.h tar/test/list.h cpio/test/list.h
- TESTS_ENVIRONMENT = $(libarchive_TESTS_ENVIRONMENT) $(bsdtar_TESTS_ENVIRONMENT) $(bsdcpio_TESTS_ENVIRONMENT)
- # Always build and test both bsdtar and bsdcpio as part of 'distcheck'
- DISTCHECK_CONFIGURE_FLAGS = --enable-bsdtar --enable-bsdcpio