[packages/rpm/dev-5.4.16] up to rpm-5.4.16-0.20160321.src.rpm, take 3

glen glen at pld-linux.org
Wed Mar 23 22:30:40 CET 2016


commit 1c9bc5fbc32281a90728b9e2173d42fe4da6f5a1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Mar 23 23:29:47 2016 +0200

    up to rpm-5.4.16-0.20160321.src.rpm, take 3
    
    http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-March/024760.html
    
    rpm-dont-copy-descriptive-tags.patch needs updating

 rpm-dont-copy-descriptive-tags.patch | 3 +++
 rpm.spec                             | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 04180f4..cd5b4ef 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -57,7 +57,7 @@ Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
 # http://rpm5.org/files/rpm/rpm-5.4/SNAPSHOT/rpm-5.4.16-0.20160315.src.rpm
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	d995d6ca11180ada2b7599e83fbaf43b
+# Source0-md5:	ccdc3bae1cf32b4cdfbd7ec187f0c8a6
 # See README.cpu-os-macros how to update cpu-os-macros.a
 Source100:	cpu-os-macros.a
 Source101:	README.cpu-os-macros
@@ -887,7 +887,7 @@ cd -
 %patch11 -p1
 %endif
 %patch12 -p1
-%patch13 -p1
+#%patch13 -p1 NEEDS UPDATING
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -1330,7 +1330,7 @@ mv $RPM_BUILD_ROOT{%{_rpmlibdir},%{_bindir}}/rpm2cpio
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,a,py}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/rpm/*.{la,py}
 %endif
 
 # wrong location, not used anyway
diff --git a/rpm-dont-copy-descriptive-tags.patch b/rpm-dont-copy-descriptive-tags.patch
index da59246..9d6e6fd 100644
--- a/rpm-dont-copy-descriptive-tags.patch
+++ b/rpm-dont-copy-descriptive-tags.patch
@@ -1,3 +1,6 @@
+http://rpm5.org/cvs/chngview?cn=18690
+
+
 --- rpm-5.4.9/build/parseDescription.c.mdvbz62979~	2012-05-03 20:39:51.000000000 +0200
 +++ rpm-5.4.9/build/parseDescription.c	2012-05-15 01:55:31.332318888 +0200
 @@ -92,6 +92,7 @@ int parseDescription(Spec spec)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list