summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody P Schafer2019-11-21 23:12:16 -0500
committerCody P Schafer2019-11-21 23:12:16 -0500
commit6d85fae63008fae25682655374ec28a4fc53a1fc (patch)
treeee9ebc946b02a87139c20086b518f937d442e4f3
parent3d31f6237de046932e79fcd5e745a77512fe0abf (diff)
parente03f25ab58ee57348e51158f4adb2558b39d0638 (diff)
downloadaur-6d85fae63008fae25682655374ec28a4fc53a1fc.tar.gz
Merge branch 'master' of ssh://aur.archlinux.org/rpm-org
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7210515865f9..bcef4d6b3f29 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.14.2
+ pkgver = 4.15.0
pkgrel = 1
url = http://www.rpm.org/
arch = i686
@@ -17,16 +17,16 @@ pkgbase = rpm-org
depends = libarchive
depends = libcap
optdepends = libdbus: systemd inhibit plugin
- provides = rpm=4.14.2
+ provides = rpm=4.15.0
provides = rpmextract=1.0-4
conflicts = rpm
conflicts = rpmextract
options = !libtool
- source = http://ftp.rpm.org/releases/rpm-4.14.x/rpm-4.14.2.tar.bz2
+ source = https://ftp.osuosl.org/pub/rpm/releases/rpm-4.15.x/rpm-4.15.0.tar.bz2
source = rpmextract.sh
source = rpmlib-filesystem-check.patch
source = bfdfix.patch
- sha1sums = 1ca664af796ab8d05ea3fccabe2b2e4767a97c74
+ sha1sums = 879fb5c560323aecae8314a3303cd8e7e1294705
sha1sums = 74849919207885ae024f1ab8ed68a76474d67ad7
sha1sums = 0c5fa516dde1f10211af896c729e4b00c313e12b
sha1sums = 456d4a2c9f71c2e3bfa5011800855a73a55aa5bc
diff --git a/PKGBUILD b/PKGBUILD
index 85675ef69151..fec5c944a7e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Author: Wintershade <Wintershade AT google mail DOT com>
pkgname=rpm-org
-pkgver=4.14.2
+pkgver=4.15.0
pkgrel=1
pkgdesc="RPM Package Manager - RPM.org fork, used in major RPM distros"
arch=('i686' 'x86_64')
@@ -18,13 +18,16 @@ conflicts=('rpm' 'rpmextract')
options=('!libtool')
provides=("rpm=${pkgver}" 'rpmextract=1.0-4')
-_base_pkgver=${pkgver%.*}.x
+
+_pkgver_major="${pkgver%%.*}"
+_pkgver_major_rem="${pkgver#*.}"
+_pkgver_minor="${_pkgver_major_rem%%.*}"
+_base_pkgver=$_pkgver_major.$_pkgver_minor.x
_pkgver=$pkgver
-#source=(https://github.com/rpm-software-management/rpm/releases/download/rpm-${pkgver}-release/rpm-${pkgver}.tar.bz2
-source=(http://ftp.rpm.org/releases/rpm-$_base_pkgver/rpm-$pkgver.tar.bz2
+source=(https://ftp.osuosl.org/pub/rpm/releases/rpm-$_base_pkgver/rpm-$pkgver.tar.bz2
rpmextract.sh rpmlib-filesystem-check.patch bfdfix.patch)
-sha1sums=('1ca664af796ab8d05ea3fccabe2b2e4767a97c74'
+sha1sums=('879fb5c560323aecae8314a3303cd8e7e1294705'
'74849919207885ae024f1ab8ed68a76474d67ad7'
'0c5fa516dde1f10211af896c729e4b00c313e12b'
'456d4a2c9f71c2e3bfa5011800855a73a55aa5bc')
@@ -32,7 +35,6 @@ sha1sums=('1ca664af796ab8d05ea3fccabe2b2e4767a97c74'
prepare() {
cd ${srcdir}/rpm-${_pkgver}
patch -p1 < ../rpmlib-filesystem-check.patch
- #patch -p1 < ../bfdfix.patch
}
build() {