From 522922fc227007679f28e5ff59bd0b69f0c4c5d0 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Thu, 31 May 2018 19:59:40 -0300
Subject: [PATCH] rpm: fix -python package, split template.

---
 common/shlibs                 |  4 ++++
 srcpkgs/{rpm-devel => librpm} |  0
 srcpkgs/librpm-devel          |  1 +
 srcpkgs/librpmbuild           |  1 +
 srcpkgs/librpmio              |  1 +
 srcpkgs/librpmsign            |  1 +
 srcpkgs/rpm/template          | 42 +++++++++++++++++++++++++++++------
 7 files changed, 43 insertions(+), 7 deletions(-)
 rename srcpkgs/{rpm-devel => librpm} (100%)
 create mode 120000 srcpkgs/librpm-devel
 create mode 120000 srcpkgs/librpmbuild
 create mode 120000 srcpkgs/librpmio
 create mode 120000 srcpkgs/librpmsign

diff --git a/common/shlibs b/common/shlibs
index 7186c9b02ed..4312122f02b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3077,6 +3077,10 @@ librpmsign.so.8 rpm-4.14.1_1
 librpmbuild.so.8 rpm-4.14.1_1
 librpmio.so.8 rpm-4.14.1_1
 libaria2.so.0 libaria2-1.33.1_3
+librpm.so.8 librpm-4.14.1_1
+librpmsign.so.8 librpmsign-4.14.1_1
+librpmbuild.so.8 librpmbuild-4.14.1_1
+librpmio.so.8 librpmio-4.14.1_1
 libsquirrel.so.0 squirrel-libs-3.1_1
 libsqstdlib.so.0 squirrel-libs-3.1_1
 libexecinfo.so.1 libexecinfo-1.1_1
diff --git a/srcpkgs/rpm-devel b/srcpkgs/librpm
similarity index 100%
rename from srcpkgs/rpm-devel
rename to srcpkgs/librpm
diff --git a/srcpkgs/librpm-devel b/srcpkgs/librpm-devel
new file mode 120000
index 00000000000..7c88ef3c072
--- /dev/null
+++ b/srcpkgs/librpm-devel
@@ -0,0 +1 @@
+rpm
\ No newline at end of file
diff --git a/srcpkgs/librpmbuild b/srcpkgs/librpmbuild
new file mode 120000
index 00000000000..7c88ef3c072
--- /dev/null
+++ b/srcpkgs/librpmbuild
@@ -0,0 +1 @@
+rpm
\ No newline at end of file
diff --git a/srcpkgs/librpmio b/srcpkgs/librpmio
new file mode 120000
index 00000000000..7c88ef3c072
--- /dev/null
+++ b/srcpkgs/librpmio
@@ -0,0 +1 @@
+rpm
\ No newline at end of file
diff --git a/srcpkgs/librpmsign b/srcpkgs/librpmsign
new file mode 120000
index 00000000000..7c88ef3c072
--- /dev/null
+++ b/srcpkgs/librpmsign
@@ -0,0 +1 @@
+rpm
\ No newline at end of file
diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template
index 285612ffb58..1113fd9d95a 100644
--- a/srcpkgs/rpm/template
+++ b/srcpkgs/rpm/template
@@ -8,11 +8,11 @@ hostmakedepends="automake gettext-devel libtool nss-devel pkg-config
  python-setuptools"
 makedepends="binutils-devel db-devel elfutils-devel file-devel libarchive-devel
  libcap-devel lua52-devel nss-devel popt-devel python-devel"
-checkdepends="${makedepends}"
 short_desc="Red Hat Package Management Utils"
 maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://rpm.org"
+changelog="http://rpm.org/wiki/Releases/${version}.html"
 distfiles="http://ftp.rpm.org/releases/rpm-${version%.*}.x/rpm-${version}.tar.bz2"
 checksum=43f40e2ccc3ca65bd3238f8c9f8399d4957be0878c2e83cba2746d2d0d96793b
 conflicts="rpmextract>=0" # Both provide rpm2cpio
@@ -24,7 +24,7 @@ CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nspr"
 case "$XBPS_TARGET_MACHINE" in
 	# Musl requires gettext to be included and it's cflag added otherwise
 	# it fails with _nl_msg_cat_cntr undefined reference error
-	*-musl*)
+	*-musl)
 	makedepends+=" gettext-devel"
 	LDFLAGS+=" -lintl"
 	;;
@@ -34,8 +34,10 @@ pre_configure() {
 	autoreconf -fi
 }
 
-rpm-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+librpm-devel_package() {
+	depends="librpm-${version}_${revision} librpmbuild-${version}_${revision}
+	 librpmsign-${version}_${revision} librpmio-${version}_${revision} db-devel
+	 popt-devel liblzma-devel zlib-devel bzip2-devel nss-devel lua52-devel"
 	short_desc+=" - development files"
 	depends="${makedepends}"
 	pkg_install() {
@@ -46,11 +48,37 @@ rpm-devel_package() {
 }
 
 rpm-python_package() {
-	short_desc+=" - python bindings"
-	depends="${sourcepkg}>=${version}_${revision}"
-	noarch=yes
 	pycompile_module="rpm"
+	short_desc+=" - python bindings"
 	pkg_install() {
 		vmove usr/lib/python2*
 	}
 }
+
+librpm_package() {
+	short_desc+=" - rpm library"
+	pkg_install() {
+		vmove "usr/lib/librpm.so.*"
+	}
+}
+
+librpmbuild_package() {
+	short_desc+=" - rpmbuild library"
+	pkg_install() {
+		vmove "usr/lib/librpmbuild.so.*"
+	}
+}
+
+librpmsign_package() {
+	short_desc+=" - rpmsign library"
+	pkg_install() {
+		vmove "usr/lib/librpmsign.so.*"
+	}
+}
+
+librpmio_package() {
+	short_desc+=" - rpmio library"
+	pkg_install() {
+		vmove "usr/lib/librpmio.so.*"
+	}
+}