rpms/rpm/devel rpm-4.6.0-rc1-permit-tab.patch, NONE, 1.1 rpm.spec, 1.299, 1.300
Panu Matilainen
pmatilai at fedoraproject.org
Sat Oct 18 23:03:34 UTC 2008
Author: pmatilai
Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8642
Modified Files:
rpm.spec
Added Files:
rpm-4.6.0-rc1-permit-tab.patch
Log Message:
- permit tab as macro argument separator (#467567)
rpm-4.6.0-rc1-permit-tab.patch:
--- NEW FILE rpm-4.6.0-rc1-permit-tab.patch ---
commit 49c515179ac0d34c2bb43bf242b8eb27ff6c11b2
Author: Panu Matilainen <pmatilai at redhat.com>
Date: Sun Oct 19 01:53:03 2008 +0300
Permit tab as whitespace between macro arguments (rhbz#467567)
- another dumb regression from macro handling cleanups
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 1e292c6..d1cbf93 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -798,7 +798,7 @@ grabArgs(MacroBuf mb, const rpmMacroEntry me, const char * se,
char *s = xcalloc((lastc-se)+1, sizeof(*s));
memcpy(s, se, (lastc-se));
- argvSplit(&av, s, " ");
+ argvSplit(&av, s, " \t");
argvAppend(&argv, av);
argvFree(av);
Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- rpm.spec 16 Oct 2008 16:19:41 -0000 1.299
+++ rpm.spec 18 Oct 2008 23:03:04 -0000 1.300
@@ -18,7 +18,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: 0.%{snapver}.1
+Release: 0.%{snapver}.2
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -32,6 +32,9 @@
# XXX only create provides for pkgconfig and libtool initially
Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
+# Patches already in upstream
+Patch200: rpm-4.6.0-rc1-permit-tab.patch
+
# These are not yet upstream
Patch300: rpm-4.5.90-posttrans.patch
@@ -162,6 +165,8 @@
%patch2 -p1 -b .gstreamer-prov
%patch100 -p1 -b .pkgconfig-deps
+%patch200 -p1 -b .permit-tab
+
# needs a bit of upstream love first...
#%patch300 -p1 -b .posttrans
@@ -352,6 +357,9 @@
%doc doc/librpm/html/*
%changelog
+* Sun Oct 19 2008 Panu Matilainen <pmatilai at redhat.com>
+- permit tab as macro argument separator (#467567)
+
* Thu Oct 16 2008 Panu Matilainen <pmatilai at redhat.com>
- update to 4.6.0-rc1
- fixes #465586, #466597, #465409, #216221, #466503, #466009, #463447...
More information about the fedora-extras-commits
mailing list