- make double-quoting work for special %%doc (#928110)
This commit is contained in:
parent
1ea7ce61c9
commit
ca0d5149bc
14
rpm-4.9.x-doc-quotes.patch
Normal file
14
rpm-4.9.x-doc-quotes.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -up rpm-4.9.1.3/build/files.c.doc-quotes rpm-4.9.1.3/build/files.c
|
||||||
|
--- rpm-4.9.1.3/build/files.c.doc-quotes 2013-03-27 08:04:35.117556856 +0200
|
||||||
|
+++ rpm-4.9.1.3/build/files.c 2013-03-27 08:04:35.143556768 +0200
|
||||||
|
@@ -892,7 +892,9 @@ static rpmRC parseForSimple(rpmSpec spec
|
||||||
|
|
||||||
|
if (*s != '/') {
|
||||||
|
if (fl->currentFlags & RPMFILE_DOC) {
|
||||||
|
- rstrscat(&specialDocBuf, " ", s, NULL);
|
||||||
|
+ char * fn = rpmEscapeSpaces(s);
|
||||||
|
+ rstrscat(&specialDocBuf, " ", fn, NULL);
|
||||||
|
+ free(fn);
|
||||||
|
} else
|
||||||
|
if (fl->currentFlags & RPMFILE_PUBKEY)
|
||||||
|
{
|
3
rpm.spec
3
rpm.spec
@ -60,6 +60,7 @@ Patch108: rpm-4.9.x-exclude-warn.patch
|
|||||||
Patch109: rpm-4.9.x-tstest-fileinfo.patch
|
Patch109: rpm-4.9.x-tstest-fileinfo.patch
|
||||||
Patch110: rpm-4.9.1.2-ppc64p7.patch
|
Patch110: rpm-4.9.1.2-ppc64p7.patch
|
||||||
Patch111: rpm-4.9.x-db-einval.patch
|
Patch111: rpm-4.9.x-db-einval.patch
|
||||||
|
Patch112: rpm-4.9.x-doc-quotes.patch
|
||||||
|
|
||||||
# These are not yet upstream
|
# These are not yet upstream
|
||||||
Patch301: rpm-4.6.0-niagara.patch
|
Patch301: rpm-4.6.0-niagara.patch
|
||||||
@ -249,6 +250,7 @@ packages on a system.
|
|||||||
%patch109 -p1 -b .tstest-fileinfo
|
%patch109 -p1 -b .tstest-fileinfo
|
||||||
%patch110 -p1 -b .ppc64p7
|
%patch110 -p1 -b .ppc64p7
|
||||||
%patch111 -p1 -b .db-einval
|
%patch111 -p1 -b .db-einval
|
||||||
|
%patch112 -p1 -b .doc-quotes
|
||||||
|
|
||||||
%patch301 -p1 -b .niagara
|
%patch301 -p1 -b .niagara
|
||||||
%patch302 -p1 -b .geode
|
%patch302 -p1 -b .geode
|
||||||
@ -486,6 +488,7 @@ exit 0
|
|||||||
* Wed Mar 27 2013 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.3-8
|
* Wed Mar 27 2013 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.3-8
|
||||||
- armv7hl and armv7hnl should not have -mthumb (#901901)
|
- armv7hl and armv7hnl should not have -mthumb (#901901)
|
||||||
- force _host_vendor to redhat to better match toolchain etc (#893381)
|
- force _host_vendor to redhat to better match toolchain etc (#893381)
|
||||||
|
- make double-quoting work for special %%doc (#928110)
|
||||||
|
|
||||||
* Mon May 07 2012 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.3-7
|
* Mon May 07 2012 Panu Matilainen <pmatilai@redhat.com> - 4.9.1.3-7
|
||||||
- Fall back to private db environment on filesystems not supporting mmap()
|
- Fall back to private db environment on filesystems not supporting mmap()
|
||||||
|
Loading…
Reference in New Issue
Block a user