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: 18-Jun-2008 22:01:52
Branch: rpm-5_1 Handle: 2008061820015101
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/build parsePreamble.c
Log:
- jbj: add non-{GIF,XPM} formats opaquely using arbitrary Icon: tagno.
Summary:
Revision Changes Path
1.2288.2.67 +1 -0 rpm/CHANGES
2.171.2.4 +4 -11 rpm/build/parsePreamble.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.66 -r1.2288.2.67 CHANGES
--- rpm/CHANGES 18 Jun 2008 19:43:36 -0000 1.2288.2.66
+++ rpm/CHANGES 18 Jun 2008 20:01:51 -0000 1.2288.2.67
@@ -1,4 +1,5 @@
5.1.3 -> 5.1.4:
+ - jbj: add non-{GIF,XPM} formats opaquely using arbitrary Icon: tagno.
- jbj: fix: allocate Icon: buffer after iconsize is initialized.
- jbj: permit configurable POSIX behavior for parameterized macros
(Marcin Kowalczyk<[EMAIL PROTECTED]>).
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.171.2.3 -r2.171.2.4 parsePreamble.c
--- rpm/build/parsePreamble.c 18 Jun 2008 19:43:37 -0000 2.171.2.3
+++ rpm/build/parsePreamble.c 18 Jun 2008 20:01:52 -0000 2.171.2.4
@@ -482,25 +482,18 @@
goto exit;
}
- if (icon[0] == 'G' && icon[1] == 'I' && icon[2] == 'F') {
+ if (icon[0] == 'G' && icon[1] == 'I' && icon[2] == 'F')
he->tag = RPMTAG_GIF;
- he->t = RPM_BIN_TYPE;
- he->p.ui8p = icon;
- he->c = nb;
- xx = headerPut(h, he, 0);
- } else
+ else
if (icon[0] == '/' && icon[1] == '*' && icon[2] == ' '
&& icon[3] == 'X' && icon[4] == 'P' && icon[5] == 'M')
- {
he->tag = RPMTAG_XPM;
+ else
+ he->tag = tagValue("Icon");
he->t = RPM_BIN_TYPE;
he->p.ui8p = icon;
he->c = nb;
xx = headerPut(h, he, 0);
- } else {
- rpmlog(RPMLOG_ERR, _("Unknown icon type: %s\n"), fn);
- goto exit;
- }
rc = 0;
exit:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
