[rpm] - add temporary fake library provides to get around deltarpm "bootstrap" dependency (yes its dirty

Panu Matilainen pmatilai at fedoraproject.org
Wed Mar 21 10:10:55 UTC 2012


commit ef85bcbf478b6d9b4959630dc7f28ce5e2a675db
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Wed Mar 21 12:10:10 2012 +0200

    - add temporary fake library provides to get around deltarpm "bootstrap"
      dependency (yes its dirty)

 rpm.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 8b82b1f..c1be359 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -22,7 +22,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}4%{?dist}
+Release: %{?snapver:0.%{snapver}.}5%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -119,6 +119,16 @@ Requires: rpm = %{version}-%{release}
 # A manual require is needed, see #505596
 Requires: libcap%{_isa} >= 2.16
 
+# XXX dirty temporary hack to get past "bootstrap" deltarpm dependency issue
+# XXX isa bits isn't quite right for multilib but suffices for this purpose
+%if %{__isa_bits} == 64
+Provides: librpm.so.2()(64bit)
+Provides: librpmio.so.2()(64bit)
+%else
+Provides: librpm.so.2
+Provides: librpmio.so.2
+%endif
+
 %description libs
 This package contains the RPM shared libraries.
 
@@ -443,6 +453,10 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Wed Mar 21 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11505.5
+- add temporary fake library provides to get around deltarpm "bootstrap"
+  dependency (yes its dirty)
+
 * Wed Mar 21 2012 Panu Matilainen <pmatilai at redhat.com> - 4.9.90-0.git11505.4
 - fix overzealous sanity check breaking posttrans scripts
 


More information about the scm-commits mailing list