- fix elf64 deps.

Changed files:
    rpm-elf64-sonamedep.patch -> 1.1
    rpm.spec -> 1.719

diff --git a/rpm-elf64-sonamedep.patch b/rpm-elf64-sonamedep.patch
new file mode 100644 (file)
index 0000000..d2cef1c
--- /dev/null
+++ b/rpm-elf64-sonamedep.patch
@@ -0,0 +1,11 @@
+--- rpm-4.4.3/lib/rpmds.c.orig 2005-11-14 23:58:08.000000000 +0100
++++ rpm-4.4.3/lib/rpmds.c      2005-11-23 11:40:13.026943000 +0100
+@@ -2512,7 +2512,7 @@
+     *t = '\0';
+ #if !defined(__alpha__)
+     if (isElf64)
+-      (void) stpcpy( stpcpy(t, s), "()(64bit)");
++      (void) stpcpy( stpcpy(t, s), strrchr(s, ')') ? "(64bit)" : "()(64bit)");
+     else
+ #endif
+       (void) stpcpy(t, s);

diff --git a/rpm.spec b/rpm.spec
index d76b7b15e148a0a80c2ed8c9f998b7877b98ec74..848dfbb3af7a9949556b506ae1a1f1ccc09612fb 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Name:          rpm
 %define        sover   4.4
 Version:       4.4.3
-Release:       0.3
+Release:       0.4
 License:       GPL
 Group:         Base
 Source0:       ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -92,7 +92,7 @@ Patch34:      %{name}-epoch0.patch
 Patch35:       %{name}-perl_req-INC_dirs.patch
 Patch36:       %{name}-debuginfo.patch
 Patch37:       %{name}-doxygen_hack.patch
-
+Patch38:       %{name}-elf64-sonamedep.patch
 Patch39:       %{name}-pythondeps.patch
 Patch40:       %{name}-print-requires.patch
 Patch41:       %{name}-reduce-stack-usage.patch
@@ -667,6 +667,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1