RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 22-Jul-2007 02:59:08
Branch: HEAD Handle: 2007072201590701
Modified files:
rpm CHANGES
rpm/rpmio macro.c
Log:
revert 2.126.
Summary:
Revision Changes Path
1.1508 +0 -1 rpm/CHANGES
2.133 +0 -8 rpm/rpmio/macro.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1507 -r1.1508 CHANGES
--- rpm/CHANGES 22 Jul 2007 00:54:19 -0000 1.1507
+++ rpm/CHANGES 22 Jul 2007 00:59:07 -0000 1.1508
@@ -4,7 +4,6 @@
- jbj: perl.prov fiddles (#249135).
- jbj: rescuscitate rpm-python, include <rpmio.h> explicitly.
- jbj: adopt rpm.org signal handling <[EMAIL PROTECTED]>
- - jbj: add %{?dir/file} as shorthand for %{?dir:%{dir}/file}.
- jbj: fix a --import memory leak.
- rse: unbreak big-endian handling in memory and cryptography functions
by Autoconf providing WORDS_BIGENDIAN and fixing usage
- rse: cleanup and fix the code to compile under *non*-GCC compilers
(e.g. Sun Studio and Intel C/C++)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
============================================================================
$ cvs diff -u -r2.132 -r2.133 macro.c
--- rpm/rpmio/macro.c 22 Jul 2007 00:54:19 -0000 2.132
+++ rpm/rpmio/macro.c 22 Jul 2007 00:59:08 -0000 2.133
@@ -1373,9 +1373,6 @@
default:
/[EMAIL PROTECTED]@*/ break;
}
- /* Reset to end-of-macro-name span. */
- for (fe = f; (c = *fe) && (xisalnum(c) || c == '_');)
- fe++;
/[EMAIL PROTECTED]@*/ break;
}
@@ -1546,11 +1543,6 @@
if (me && me->body && *me->body) { /* Expand %{?f}/%{?f*} */
rc = expandT(mb, me->body, strlen(me->body));
}
- /* Append %{?_foo/bar}. */
- if (!g && se[-1] == '}' && *fe == '/') {
- while ((c = *fe++) && fe < se)
- SAVECHAR(mb, c);
- }
s = se;
continue;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
