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: 05-Jun-2008 00:45:11
Branch: HEAD Handle: 2008060422451100
Modified files:
rpm CHANGES macros.in
rpm/build parsePreamble.c
Log:
- add %_build_iconsize macro to permit configuration.
Summary:
Revision Changes Path
1.2395 +1 -0 rpm/CHANGES
2.172 +7 -1 rpm/build/parsePreamble.c
1.247 +5 -1 rpm/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2394 -r1.2395 CHANGES
--- rpm/CHANGES 4 Jun 2008 19:53:25 -0000 1.2394
+++ rpm/CHANGES 4 Jun 2008 22:45:11 -0000 1.2395
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - jbj: add %_build_iconsize macro to permit configuration.
- jbj: trash-and-restore macro config for multiple CLI arg builds.
- rpm.org: use same code for creating the digest object on iteration and
method call,
- jbj: rpmrepo: correct requiressqlentry tag name typo.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.171 -r2.172 parsePreamble.c
--- rpm/build/parsePreamble.c 2 Apr 2008 20:34:17 -0000 2.171
+++ rpm/build/parsePreamble.c 4 Jun 2008 22:45:11 -0000 2.172
@@ -384,10 +384,10 @@
/[EMAIL PROTECTED] rpmGlobalMacroContext, h_errno, fileSystem,
internalState @*/
/[EMAIL PROTECTED] h, rpmGlobalMacroContext, fileSystem, internalState
@*/
{
+ static size_t iconsize = 0;
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
const char *fn, *Lurlfn = NULL;
struct Source *sp;
- size_t iconsize = 2048; /* XXX big enuf */
size_t nb;
uint8_t * icon = alloca(iconsize+1);
FD_t fd = NULL;
@@ -395,6 +395,12 @@
int urltype;
int xx;
+ if (iconsize == 0) {
+ iconsize = rpmExpandNumeric("%{?_build_iconsize}");
+ if (iconsize < 2048)
+ iconsize = 2048;
+ }
+
for (sp = spec->sources; sp != NULL; sp = sp->next) {
if (sp->flags & RPMFILE_ICON)
break;
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros.in
============================================================================
$ cvs diff -u -r1.246 -r1.247 macros.in
--- rpm/macros.in 28 May 2008 01:04:12 -0000 1.246
+++ rpm/macros.in 4 Jun 2008 22:45:11 -0000 1.247
@@ -1,7 +1,7 @@
#/*! \page config_macros Default configuration: @USRLIBRPM@/macros
# \verbatim
#
-# $Id: macros.in,v 1.246 2008/05/28 01:04:12 jbj Exp $
+# $Id: macros.in,v 1.247 2008/06/04 22:45:11 jbj Exp $
#
# This is a global RPM configuration file. All changes made here will
# be lost when the rpm package is upgraded. Any per-system configuration
@@ -538,6 +538,10 @@
# Byte size of line buffer for .spec file parsing
%_spec_line_buffer_size 100000
+#
+# Maximum Icon: graphic file size (undefined or < 2048 uses 2048).
+%_build_iconsize 2048
+
#==============================================================================
# ---- Database configuration macros.
# Macros used to configure Berkley db parameters.
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
