summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2017-12-28 12:13:22 -0500
committerEli Schwartz2017-12-28 12:13:22 -0500
commit8c8897df139dcb1861ed2b68f562d02279700d31 (patch)
tree5753a843f2ab251a663c10c745eb2f3b4dd3d83e
parentcedeae91278fdf02ed30b4399aa141b879f64ab1 (diff)
downloadaur-8c8897df139dcb1861ed2b68f562d02279700d31.tar.gz
upgpkg: pacman-git 5.0.1.192.ge4f13e62-1
too early to add the "r", this causes downgrades
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD12
-rw-r--r--pacman.conf.i6862
-rw-r--r--pacman.conf.x86_642
4 files changed, 14 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e7f902371a69..c78a47c977e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pacman-git
pkgdesc = A library-based package manager with dependency support. git version.
- pkgver = 5.0.1.r192.ge4f13e62
+ pkgver = 5.0.1.192.ge4f13e62
pkgrel = 1
url = http://www.archlinux.org/pacman/
arch = i686
@@ -16,7 +16,8 @@ pkgbase = pacman-git
depends = gpgme
depends = libarchive
depends = pacman-mirrorlist
- provides = pacman=5.0.1
+ optdepends = pacman-contrib: various helper utilities
+ provides = pacman=5.0.1.192.ge4f13e62
conflicts = pacman
options = strip
options = debug
@@ -27,8 +28,8 @@ pkgbase = pacman-git
source = pacman.conf.x86_64
source = makepkg.conf
sha256sums = SKIP
- sha256sums = cb76123c15ca9f2a467ebecb72af611f618fcc8431cf8b437d40fa2e61c23590
- sha256sums = 95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b
+ sha256sums = 0c087d26e80333267391a6e9e34b95a2ffb103cb9391cb53cc5d97ad954af774
+ sha256sums = c5a3ec55f9d1bc52e5e5b127f76b7b16b79738268691a3e1d842359033e460da
sha256sums = 6066d67d818ee36760bf121c76d5019130f7875b3e5ed179b319b810a3a9685b
pkgname = pacman-git
diff --git a/PKGBUILD b/PKGBUILD
index cbedecee03d0..8e3951f6f84d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Dave Reisner <d@falconindy.com>
+# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Contributor: Dave Reisner <d@falconindy.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: godane <slaxemulator@gmail.com.com>
# Contributor: Andres Perera <aepd87@gmail.com>
pkgname=pacman-git
-pkgver=5.0.1.r192.ge4f13e62
+pkgver=5.0.1.192.ge4f13e62
pkgrel=1
pkgdesc="A library-based package manager with dependency support. git version."
arch=('i686' 'x86_64')
@@ -12,6 +13,7 @@ url="http://www.archlinux.org/pacman/"
license=('GPL')
depends=('archlinux-keyring' 'bash' 'curl' 'gpgme' 'libarchive'
'pacman-mirrorlist')
+optdepends=('pacman-contrib: various helper utilities')
makedepends=('git' 'asciidoc')
checkdepends=('python2' 'fakechroot')
provides=("pacman=${pkgver%.r*}")
@@ -24,13 +26,13 @@ source=(git+https://git.archlinux.org/pacman.git
pacman.conf.x86_64
makepkg.conf)
sha256sums=('SKIP'
- 'cb76123c15ca9f2a467ebecb72af611f618fcc8431cf8b437d40fa2e61c23590'
- '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
+ '0c087d26e80333267391a6e9e34b95a2ffb103cb9391cb53cc5d97ad954af774'
+ 'c5a3ec55f9d1bc52e5e5b127f76b7b16b79738268691a3e1d842359033e460da'
'6066d67d818ee36760bf121c76d5019130f7875b3e5ed179b319b810a3a9685b')
pkgver() {
cd pacman
- git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe | sed 's/^v//;s/-/./g'
}
prepare() {
diff --git a/pacman.conf.i686 b/pacman.conf.i686
index 0ea157018534..8b2fe248c05b 100644
--- a/pacman.conf.i686
+++ b/pacman.conf.i686
@@ -15,7 +15,7 @@
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/
-HoldPkg = pacman glibc
+HoldPkg = pacman-git glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
diff --git a/pacman.conf.x86_64 b/pacman.conf.x86_64
index 8ce691913fef..822e9310901d 100644
--- a/pacman.conf.x86_64
+++ b/pacman.conf.x86_64
@@ -15,7 +15,7 @@
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/
-HoldPkg = pacman glibc
+HoldPkg = pacman-git glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled