Updated to 4.13.0 and added patch for binutils

3 files changed, 43 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72bcd318939e..58c490309873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sun Nov 20 18:06:33 UTC 2016
-pkgbase = rpm-org
+pkgbase = rpm-org-413
 	pkgdesc = RPM Package Manager - RPM.org fork, used in major RPM distros
-	pkgver = 4.12.0.2
-	pkgrel = 3
+	pkgver = 4.13.0
+	pkgrel = 1
 	url = http://www.rpm.org/
 	arch = i686
 	arch = x86_64
@@ -18,19 +16,20 @@ pkgbase = rpm-org
 	depends = libarchive
 	depends = libcap
 	optdepends = libdbus: systemd inhibit plugin
-	provides = rpm=4.12.0.2
+	provides = rpm-org
+	provides = rpm=4.13.0
 	provides = rpmextract=1.0-4
 	conflicts = rpm
 	conflicts = rpmextract
 	options = !libtool
-	source = https://github.com/rpm-software-management/rpm/releases/download/rpm-4.12.0.2-release/rpm-4.12.0.2.tar.bz2
+	source = https://github.com/rpm-software-management/rpm/releases/download/rpm-4.13.0-release/rpm-4.13.0.tar.bz2
 	source = rpmextract.sh
 	source = rpmlib-filesystem-check.patch
-	source = lua-5.3.patch
-	sha1sums = f32216a3bb342fff7a0e3c7d9fa452b7eaae19da
+	source = bfdfix.patch
+	sha1sums = c6ce4f879ca6a75340921093105e5ef9d33381d3
 	sha1sums = 74849919207885ae024f1ab8ed68a76474d67ad7
 	sha1sums = 0c5fa516dde1f10211af896c729e4b00c313e12b
-	sha1sums = e8efa065eb42648ac431a48b083888ae77e8ae4b
+	sha1sums = 456d4a2c9f71c2e3bfa5011800855a73a55aa5bc
 
-pkgname = rpm-org
+pkgname = rpm-org-413
 
diff --git a/PKGBUILD b/PKGBUILD
index aad964645c4e..c62ee5290e1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,11 @@
 # Contributor: Fernando M <f <at> beford.net>
 # Author: Wintershade <Wintershade AT google mail DOT com>
 
-pkgname=rpm-org
-pkgver=4.12.0.2
+pkgname=rpm-org-413
+pkgver=4.13.0
 _pkgver=$pkgver
 #_pkgver=4.12.0-rc1
-pkgrel=3
+pkgrel=1
 pkgdesc="RPM Package Manager - RPM.org fork, used in major RPM distros"
 arch=('i686' 'x86_64')
 url="http://www.rpm.org/"
@@ -18,19 +18,19 @@ makedepends=('python2' 'python')
 optdepends=('libdbus: systemd inhibit plugin')
 conflicts=('rpm' 'rpmextract')
 options=('!libtool')
-provides=("rpm=${pkgver}" 'rpmextract=1.0-4')
+provides=('rpm-org' "rpm=${pkgver}" 'rpmextract=1.0-4')
 source=(https://github.com/rpm-software-management/rpm/releases/download/rpm-${pkgver}-release/rpm-${pkgver}.tar.bz2
-	rpmextract.sh rpmlib-filesystem-check.patch lua-5.3.patch)
-sha1sums=('f32216a3bb342fff7a0e3c7d9fa452b7eaae19da'
+	rpmextract.sh rpmlib-filesystem-check.patch bfdfix.patch)
+sha1sums=('c6ce4f879ca6a75340921093105e5ef9d33381d3'
           '74849919207885ae024f1ab8ed68a76474d67ad7'
           '0c5fa516dde1f10211af896c729e4b00c313e12b'
-          'e8efa065eb42648ac431a48b083888ae77e8ae4b')
+          '456d4a2c9f71c2e3bfa5011800855a73a55aa5bc')
 
 prepare() {
 	cd ${srcdir}/rpm-${_pkgver}
 	patch -p1 < ../rpmlib-filesystem-check.patch
-	patch -p1 < ../lua-5.3.patch
-}
+	patch -p1 < ../bfdfix.patch
+	}
 
 
 build() {
diff --git a/bfdfix.patch b/bfdfix.patch
new file mode 100644
index 000000000000..c3e7d69a3cc6
--- /dev/null
+++ b/bfdfix.patch
@@ -0,0 +1,24 @@
+diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c
+index cd7fa02..03db7af 100644
+--- a/tools/sepdebugcrcfix.c
++++ b/tools/sepdebugcrcfix.c
+@@ -28,7 +28,19 @@
+ #include <error.h>
+ #include <libelf.h>
+ #include <gelf.h>
++#ifndef PACKAGE
++#define PACKAGE
++#ifndef PACKAGE_VERSION
++#define PACKAGE_VERSION
+ #include <bfd.h>
++#undef PACKAGE_VERSION
++#else
++#include <bfd.h>
++#endif
++#undef PACKAGE
++#else
++#include <bfd.h>
++#endif
+ 
+ #define _(x) x
+ #define static_assert(expr) \