[arch-commits] Commit in pacman/trunk (4 files)

[Allan McRae]

    Date: Saturday, January 30, 2016 @ 01:40:01
  Author: allan
Revision: 258691

upgpkg: pacman 5.0.0-1

upstream update

Modified:
  pacman/trunk/PKGBUILD
  pacman/trunk/makepkg.conf
  pacman/trunk/pacman.conf.i686
  pacman/trunk/pacman.conf.x86_64

--------------------+
 PKGBUILD           |   26 +++++++++-----------------
 makepkg.conf       |    5 +++--
 pacman.conf.i686   |    1 +
 pacman.conf.x86_64 |    1 +
 4 files changed, 14 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-29 18:07:24 UTC (rev 258690)
+++ PKGBUILD	2016-01-30 00:40:01 UTC (rev 258691)
@@ -4,14 +4,14 @@
 # Maintainer: Dave Reisner <dreisner at archlinux.org>
 
 pkgname=pacman
-pkgver=4.2.1
-pkgrel=4
+pkgver=5.0.0
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org/pacman/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('bash' 'glibc' 'libarchive>=3.1.2' 'curl>=7.39.0'
+depends=('bash' 'glibc' 'libarchive' 'curl'
          'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
 makedepends=('asciidoc')   # roundup patch alters docs
 checkdepends=('python2' 'fakechroot')
@@ -21,25 +21,17 @@
 backup=(etc/pacman.conf etc/makepkg.conf)
 options=('strip' 'debug')
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
-	ensure-matching-database-and-package-version.patch
         pacman.conf.i686
         pacman.conf.x86_64
         makepkg.conf)
-md5sums=('2a596fc8f723e99660c0869a74afcf47'
+md5sums=('9ecf8a5b659c0e02232c945ab198e6e1'
          'SKIP'
-         'e8f72afe6f417d11bd36ada042744fe4'
-         '2db6c94709bb30cc614a176ecf8badb1'
-         'de74a13618347f08ae4a9637f74471c4'
-         '4036ccfaed40622a1df74fd464fe0582')
+         'bdb40c76225c2fd8874bd34b6a3f6ad7'
+         'c511ee4c7a86a37e8841440ede89300d'
+         'f5b59fe5f016eebd9590318530bbd996')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD')  # Allan McRae <allan at archlinux.org>
 
 
-prepare() {
-  cd "$pkgname-$pkgver"
-
-  patch -p1 -i $srcdir/ensure-matching-database-and-package-version.patch
-}
-
 build() {
   cd "$pkgname-$pkgver"
 
@@ -47,8 +39,8 @@
     --localstatedir=/var --enable-doc \
     --with-scriptlet-shell=/usr/bin/bash \
     --with-ldconfig=/usr/bin/ldconfig
-  make
-  make -C contrib
+  make V=1
+  make -C contrib 
 }
 
 check() {

Modified: makepkg.conf
===================================================================
--- makepkg.conf	2016-01-29 18:07:24 UTC (rev 258690)
+++ makepkg.conf	2016-01-30 00:40:01 UTC (rev 258691)
@@ -73,7 +73,7 @@
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -84,9 +84,10 @@
 #-- zipman:     Compress manual (man and info) pages in MAN_DIRS with gzip
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- upx:        Compress binary executable files using UPX
+#-- optipng:    Optimize PNG images with optipng
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !optipng !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)

Modified: pacman.conf.i686
===================================================================
--- pacman.conf.i686	2016-01-29 18:07:24 UTC (rev 258690)
+++ pacman.conf.i686	2016-01-30 00:40:01 UTC (rev 258691)
@@ -14,6 +14,7 @@
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u

Modified: pacman.conf.x86_64
===================================================================
--- pacman.conf.x86_64	2016-01-29 18:07:24 UTC (rev 258690)
+++ pacman.conf.x86_64	2016-01-30 00:40:01 UTC (rev 258691)
@@ -14,6 +14,7 @@
 #CacheDir    = /var/cache/pacman/pkg/
 #LogFile     = /var/log/pacman.log
 #GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
 HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -C - -f %u > %o
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u