summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2014-09-22 14:24:26 +0200
committerJohannes Dewender2014-09-22 14:24:26 +0200
commitf26375bb655a653152dc8c4a00f029ddf6ccb009 (patch)
tree7d6cf36917a0861340f4ae45d7f17d5d6f2b7217
parente82fbbd3e56242a1202c70154d4df1ed9dcea251 (diff)
downloadaur-f26375bb655a653152dc8c4a00f029ddf6ccb009.tar.gz
rpm-org: 4.12.0.1
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD19
-rw-r--r--rpmlib-filesystem-check.patch4
3 files changed, 21 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 33f246443715..b7d025b87edd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rpm-org
pkgdesc = RPM Package Manager - RPM.org fork, used in major RPM distros
- pkgver = 4.12.0_rc1
+ pkgver = 4.12.0.1
pkgrel = 1
url = http://www.rpm.org/
arch = i686
@@ -8,23 +8,25 @@ pkgbase = rpm-org
license = GPL2
makedepends = python2
makedepends = python
- depends = lua
+ depends = lua>=5.1
depends = file
depends = nss>=3.12
depends = popt
depends = elfutils
depends = libarchive
- provides = rpm=4.12.0_rc1
+ depends = libcap
+ optdepends = libdbus: systemd inhibit plugin
+ provides = rpm=4.12.0.1
provides = rpmextract=1.0-4
conflicts = rpm
conflicts = rpmextract
options = !libtool
- source = http://rpm.org/releases/testing/rpm-4.12.0-rc1.tar.bz2
+ source = http://rpm.org/releases/rpm-4.12.x/rpm-4.12.0.1.tar.bz2
source = rpmextract.sh
source = rpmlib-filesystem-check.patch
- md5sums = fbc9b72ddfdafe07230e6d54a9b50f09
- md5sums = 1f7f4f3b3a93ff6d2f600c7751ae25ef
- md5sums = 62a62de128345a8a7a6195fd59f8cd71
+ sha1sums = d416bdb249b246b00b2d5d34c66e7f5a68a62524
+ sha1sums = 74849919207885ae024f1ab8ed68a76474d67ad7
+ sha1sums = 0c5fa516dde1f10211af896c729e4b00c313e12b
pkgname = rpm-org
diff --git a/PKGBUILD b/PKGBUILD
index 46801ccca002..6607bc47f3b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,25 +5,26 @@
# Author: Wintershade <Wintershade AT google mail DOT com>
pkgname=rpm-org
-pkgver=4.12.0_rc1
-#_pkgver=$pkgver
-_pkgver=4.12.0-rc1
+pkgver=4.12.0.1
+_pkgver=$pkgver
+#_pkgver=4.12.0-rc1
pkgrel=1
pkgdesc="RPM Package Manager - RPM.org fork, used in major RPM distros"
arch=('i686' 'x86_64')
url=("http://www.rpm.org/")
license=('GPL2')
-depends=('lua' 'file' 'nss>=3.12' 'popt' 'elfutils' 'libarchive')
+depends=('lua>=5.1' 'file' 'nss>=3.12' 'popt' 'elfutils' 'libarchive' 'libcap')
makedepends=('python2' 'python')
+optdepends=('libdbus: systemd inhibit plugin')
conflicts=('rpm' 'rpmextract')
options=('!libtool')
provides=("rpm=${pkgver}" 'rpmextract=1.0-4')
-#source=(http://rpm.org/releases/rpm-4.11.x/rpm-${pkgver}.tar.bz2
-source=(http://rpm.org/releases/testing/rpm-${_pkgver}.tar.bz2
+#source=(http://rpm.org/releases/testing/rpm-${_pkgver}.tar.bz2
+source=(http://rpm.org/releases/rpm-4.12.x/rpm-${pkgver}.tar.bz2
rpmextract.sh rpmlib-filesystem-check.patch)
-md5sums=('fbc9b72ddfdafe07230e6d54a9b50f09'
- '1f7f4f3b3a93ff6d2f600c7751ae25ef'
- '62a62de128345a8a7a6195fd59f8cd71')
+sha1sums=('d416bdb249b246b00b2d5d34c66e7f5a68a62524'
+ '74849919207885ae024f1ab8ed68a76474d67ad7'
+ '0c5fa516dde1f10211af896c729e4b00c313e12b')
prepare() {
cd ${srcdir}/rpm-${_pkgver}
diff --git a/rpmlib-filesystem-check.patch b/rpmlib-filesystem-check.patch
index ec4324c7f99f..984d8c4af854 100644
--- a/rpmlib-filesystem-check.patch
+++ b/rpmlib-filesystem-check.patch
@@ -1,7 +1,7 @@
diff -up rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check rpm-4.10.90.git11978/lib/depends.c
--- rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check 2012-11-01 09:40:26.000000000 +0200
+++ rpm-4.10.90.git11978/lib/depends.c 2012-11-05 10:53:42.294733695 +0200
-@@ -537,6 +537,109 @@ static int rpmdbProvides(rpmts ts, depCa
+@@ -589,6 +589,109 @@ static int rpmdbProvides(rpmts ts, depCa
return rc;
}
@@ -111,7 +111,7 @@ diff -up rpm-4.10.90.git11978/lib/depends.c.rpmlib-filesystem-check rpm-4.10.90.
/**
* Check dep for an unsatisfied dependency.
* @param ts transaction set
-@@ -560,8 +663,10 @@ retry:
+@@ -612,8 +715,10 @@ retry:
* Check those dependencies now.
*/
if (dsflags & RPMSENSE_RPMLIB) {