* Bump version to 5.1.1

* Use bzip2 compression (rpms can have gzip or bzip2 payloads)
* -j1, rpm cannot build with more than 1 thread

diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index b5aec858031d71622626f72fd445360e0cde4c75..42e82e2a5ffb274457ec91af1a3b8cab4b9607e1 100644 (file)
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_RPM
        bool "rpm"
        default n
        select BR2_PACKAGE_ZLIB
+       select BR2_PACKAGE_BZIP2
        select BR2_PACKAGE_BEECRYPT
        select BR2_PACKAGE_NEON
        select BR2_PACKAGE_POPT

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 32dd3b1c8e8aae285ade888399f78a3ff679a884..d83f0d49ec453f09c677dedcbd7357785797e710 100644 (file)
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -3,11 +3,11 @@
 # rpm
 #
 #############################################################
-RPM_VERSION = 5.1.0
-RPM_SITE = http://rpm5.org/files/rpm/rpm-5.0/
+RPM_VERSION = 5.1.1
+RPM_SITE = http://rpm5.org/files/rpm/rpm-5.1/
 RPM_AUTORECONF = YES
 
-RPM_DEPENDENCIES = zlib beecrypt neon popt
+RPM_DEPENDENCIES = zlib bzip2 beecrypt neon popt
 
 RPM_CONF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/beecrypt -I$(STAGING_DIR)/usr/include/neon" \
                ac_cv_va_copy=yes
@@ -19,8 +19,11 @@ RPM_CONF_OPT = --disable-build-versionscript --disable-rpath \
        --with-libbeecrypt=$(STAGING_DIR) \
        --with-popt=$(STAGING_DIR) \
        --with-mutex=UNIX/fcntl \
+       --with-bzip2 \
        $(DISABLE_NLS)
 
+RPM_MAKE_OPT = -j1
+
 RPM_INSTALL_TARGET_OPT=DESTDIR=$(TARGET_DIR) program_transform_name= install
 
 $(eval $(call AUTOTARGETS,package,rpm))