[packages/rpm/dev-5.4.16] updated patches

[glen]

commit 64273f12d71200e62b4dcf7682fc972c8c888274
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 20 16:52:14 2016 +0300

    updated patches

 rpm-5.4.9-keep-loading-script-macros.patch              | 11 +++--------
 rpm-5.4.9-support-signatures-and-digest-disablers.patch |  8 ++++----
 rpm-lua-expat.patch                                     | 16 ++++++++--------
 rpm.spec                                                |  2 +-
 4 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index f6a5eda..a8fc5f1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -945,7 +945,7 @@ cd -
 %patch71 -p1
 %patch74 -p1
 %patch75 -p1
-%patch77 -p0
+%patch77 -p1
 %patch78 -p1
 %patch79 -p1
 
diff --git a/rpm-5.4.9-keep-loading-script-macros.patch b/rpm-5.4.9-keep-loading-script-macros.patch
index 393c16a..48244d0 100644
--- a/rpm-5.4.9-keep-loading-script-macros.patch
+++ b/rpm-5.4.9-keep-loading-script-macros.patch
@@ -1,11 +1,6 @@
---- rpm-5.4.16/macros/macros.in~	2016-03-16 17:20:06.000000000 +0200
-+++ rpm-5.4.16/macros/macros.in	2016-03-16 17:21:36.845860496 +0200
-@@ -1050,15 +1050,15 @@
- 
- #==============================================================================
- # ---- rpmbuild macros.
--#%%{load:%{_usrlibrpm}/macros.rpmbuild}
-+%{load:%{_usrlibrpm}/macros.rpmbuild}
+--- rpm-5.4.16/macros/macros.in~	2016-04-20 16:52:06.000000000 +0300
++++ rpm-5.4.16/macros/macros.in	2016-04-20 16:52:40.148730512 +0300
+@@ -1054,11 +1054,11 @@
  
  #------------------------------------------------------------------------
  # cmake(...) configuration
diff --git a/rpm-5.4.9-support-signatures-and-digest-disablers.patch b/rpm-5.4.9-support-signatures-and-digest-disablers.patch
index af9e1a7..ca49dc8 100644
--- a/rpm-5.4.9-support-signatures-and-digest-disablers.patch
+++ b/rpm-5.4.9-support-signatures-and-digest-disablers.patch
@@ -1,11 +1,11 @@
---- rpm-5.4.9/system.h.nosig~	2012-05-16 20:52:58.216415034 +0200
-+++ rpm-5.4.9/system.h	2012-05-16 20:53:29.053598105 +0200
-@@ -746,7 +746,7 @@ static inline const char *rcsid(const ch
+--- rpm-5.4.16/system.h~	2016-04-11 23:41:23.000000000 +0300
++++ rpm-5.4.16/system.h	2016-04-20 16:53:47.922255843 +0300
+@@ -789,7 +789,7 @@
  /**
   * Eliminate signature/digest disablers.
   */
 -#undef	SUPPORT_NOSIGNATURES
 +#define	SUPPORT_NOSIGNATURES 1
+ #undef	SUPPORT_NODIGESTS
  
  /**
-  * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.
diff --git a/rpm-lua-expat.patch b/rpm-lua-expat.patch
index a3ac839..ab55b63 100644
--- a/rpm-lua-expat.patch
+++ b/rpm-lua-expat.patch
@@ -1,14 +1,14 @@
---- lua/Makefile.am~	2013-06-29 22:03:22.000000000 +0100
-+++ lua/Makefile.am	2013-09-23 19:07:35.157853272 +0100
-@@ -230,7 +230,10 @@
- #	local/lwrs.h
- #	local/lwrs.c
+--- rpm-5.4.16/lua/Makefile.am~	2016-04-19 19:19:35.000000000 +0300
++++ rpm-5.4.16/lua/Makefile.am	2016-04-20 16:51:20.574586445 +0300
+@@ -326,7 +326,10 @@
+ 	lzio.c
  
+ liblua_la_DEPENDENCIES =
 -liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm -lexpat
 +liblua_la_LIBADD = @WITH_LUA_SUBDIR_LIB@ -lm
 +if USE_LUA_CRYPTO
 +liblua_la_LIBADD += -lexpat
 +endif
- liblua_la_SOURCES += \
- 	local/llocal.c \
- 	local/llocal.h \
+ liblua_la_LDFLAGS = $(LDFLAGS)
+ 
+ liblua.la: $(liblua_la_OBJECTS) $(liblua_la_DEPENDENCIES) 
================================================================

---- gitweb:

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