summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2013-04-29 16:23:36 +0200
committerJohannes Dewender2013-04-29 16:23:36 +0200
commitb6a486c6ac6bb008af9db633339b41554d053f80 (patch)
tree8e425411f62bd60ac81a80f84546dc88887bfaa7
parent69dc2d2df4dca875a0b91db2394b10bca28ebbea (diff)
downloadaur-b6a486c6ac6bb008af9db633339b41554d053f80.tar.gz
rpm-org: fix namcap warnings
Move rpm from /bin to /usr/bin Remove empty /var Remove db dependency from core
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD11
2 files changed, 10 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 09eac2cfae2f..cf22d460905b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,6 @@ pkgbase = rpm-org
depends = nss>=3.12
depends = popt
depends = elfutils
- depends = db
depends = libarchive
provides = rpm=4.11.0.1
provides = rpmextract=1.0-4
diff --git a/PKGBUILD b/PKGBUILD
index 9a78c947c65e..5d47a154a3d5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ 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' 'db' 'libarchive')
+depends=('lua' 'file' 'nss>=3.12' 'popt' 'elfutils' 'libarchive')
makedepends=('python2')
conflicts=('rpm' 'rpmextract')
options=('!libtool')
@@ -48,6 +48,15 @@ package() {
cd ${srcdir}/rpm-${pkgver}
make prefix=${pkgdir}/usr localstatedir=${pkgdir}/var install
rmdir ${pkgdir}/var/tmp
+ rmdir ${pkgdir}/var
# rpmextract using bsdtar, needs libarchive
install -m755 ${srcdir}/rpmextract.sh ${pkgdir}/usr/bin/
+
+ # move rpm from /bin to /usr/bin
+ mv ${pkgdir}/bin/rpm ${pkgdir}/usr/bin/
+ rm ${pkgdir}/usr/bin/rpm{query,verify}
+ cd ${pkgdir}/usr/bin
+ ln -s rpm rpmquery
+ ln -s rpm rpmverify
+ rm -r ${pkgdir}/bin/
}