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:00:50
Branch: HEAD Handle: 2008061820005000
Modified files:
rpm CHANGES
rpm/build parsePreamble.c
Log:
- jbj: add non-{GIF,XPM} formats opaquely using arbitrary Icon: tagno.
Summary:
Revision Changes Path
1.2425 +1 -0 rpm/CHANGES
2.175 +8 -15 rpm/build/parsePreamble.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2424 -r1.2425 CHANGES
--- rpm/CHANGES 18 Jun 2008 19:42:26 -0000 1.2424
+++ rpm/CHANGES 18 Jun 2008 20:00:50 -0000 1.2425
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - 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.174 -r2.175 parsePreamble.c
--- rpm/build/parsePreamble.c 18 Jun 2008 19:42:27 -0000 2.174
+++ rpm/build/parsePreamble.c 18 Jun 2008 20:00:50 -0000 2.175
@@ -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;
- 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;
- }
+ else
+ he->tag = tagValue("Icon");
+ he->t = RPM_BIN_TYPE;
+ he->p.ui8p = icon;
+ he->c = nb;
+ xx = headerPut(h, he, 0);
rc = 0;
exit:
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
