[packages/rpm] - shut up rpm complaining about CHAR_TYPE noy being INT8_TYPE on header - load pld macros before bui

[baggins]

commit badae32f5122b2dc071ae7f2241d9cac9bf97590
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 8 23:56:58 2012 +0200

    - shut up rpm complaining about CHAR_TYPE noy being INT8_TYPE on header
    - load pld macros before build macros (as build macros can redefine
      default distro macros, like _topdir)

 rpm-silence-RPM_CHAR_TYPE.patch | 10 ++++++++++
 rpm.spec                        |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f0a8936..a1136d2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	0.7
+Release:	0.8
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -139,6 +139,7 @@ Patch82:	%{name}-libmagic-locale.patch
 Patch83:	%{name}-namespace-probe.patch
 Patch84:	%{name}-popt-coreutils.patch
 Patch85:	%{name}-postun-nofail.patch
+Patch86:	%{name}-silence-RPM_CHAR_TYPE.patch
 
 # Patches imported from Mandriva
 
@@ -802,6 +803,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch83 -p1
 %patch84 -p1
 %patch85 -p1
+%patch86 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -898,7 +900,7 @@ sed -i \
 	--with-keyutils=none \
 	--with-uuid=%{_libdir}:%{_includedir}/ossp-uuid \
 	--without-path-versioned \
-	--with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/macros.d/pld:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
+	--with-extra-path-macros='%{_sysconfdir}/rpm/macros.d/*.macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
 	--with-bugreport="http://bugs.pld-linux.org/" \
 	--with-vendor=pld
 
diff --git a/rpm-silence-RPM_CHAR_TYPE.patch b/rpm-silence-RPM_CHAR_TYPE.patch
new file mode 100644
index 0000000..f7213ce
--- /dev/null
+++ b/rpm-silence-RPM_CHAR_TYPE.patch
@@ -0,0 +1,10 @@
+--- rpm-5.4.10/rpmdb/tagname.c~	2012-04-25 22:34:49.000000000 +0200
++++ rpm-5.4.10/rpmdb/tagname.c	2012-09-07 23:10:04.768327450 +0200
+@@ -508,6 +508,7 @@
+ if (!(he->tag == 62))
+ if (!(he->tag == 261 || he->tag == 269))
+ if (!(he->tag == 1000 || he->tag == 1004 || he->tag == 1007))
++if (!(he->tag == 1029))
+ if (!(he->tag == 1086 || he->tag == 1087))
+ if (he->t != (tagType(he->tag) & 0xffff))
+ fprintf(stderr, "==> warning: tag %u type(0x%x) != implicit type(0x%x)\n", (unsigned) he->tag, he->t, tagType(he->tag));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/badae32f5122b2dc071ae7f2241d9cac9bf97590