From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 25 Oct 2012 09:51:57 +0000 (+0200)
Subject: - moved __nofsync definition
X-Git-Tag: auto/th/rpm-5.4.10-29
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=c978e4e0613a0fb8ed2667f8f12a7c1655ca07cd;p=packages%2Frpm.git

- moved __nofsync definition

Rationale:
With %{load:...} being interpreted immediately -- not lazily --
within a macro init file, a failure to load causes immediate
loading  termination silently.
---

diff --git a/macros.pld.in b/macros.pld.in
index a06e55f..353220b 100644
--- a/macros.pld.in
+++ b/macros.pld.in
@@ -187,6 +187,9 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 %x8664 x86_64 amd64 ia32e
 %ppc   ppc ppc7400 ppc7450
 
+# avoid fdatasync syscall flood during database operations.
+%__nofsync	nofsync
+
 #---------------------------------------------------------------------
 #	Expanded at end of %prep
 #
@@ -199,9 +202,8 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 
 %__id		/bin/id
 
+#
+# DO NOT put anything after this %%{load:...} !
 #
 # rpm5 prolog for loading the standard macro
 %{load:/etc/rpm/macros.d/*.macros}
-
-# avoid fdatasync syscall flood during database operations.
-%__nofsync	nofsync
diff --git a/rpm.spec b/rpm.spec
index d705983..3befce9 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	28
+Release:	29
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm