- 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 a06e55fa5997e46d5402d6477070e277d8436611..353220bfaca78cd467c4f6dba87f3da2422088cc 100644 (file)
--- 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 d7059836deef73421846796725d33285b86ba816..3befce9072b3a8e2661eda14a3e1510438ed1142 100644 (file)
--- 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