Hello community, here is the log from the commit of package rpm checked in at Fri Nov 23 01:38:15 CET 2007. -------- --- rpm/rpm.changes 2007-10-11 13:37:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-11-16 20:48:35.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 16 20:46:42 CET 2007 - dmueller@suse.de + +- shorten changelogs in binary rpms (#308569) + * saves 4.3MB for the one CD media + +------------------------------------------------------------------- New: ---- rpm-shorten-changelog.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.Jn9926/_old 2007-11-23 01:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Jn9926/_new 2007-11-23 01:37:47.000000000 +0100 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 169 +Release: 181 Requires: rpm = %{version} %py_requires Source99: rpm.spec @@ -59,6 +59,7 @@ %files %defattr(-,root,root) %{_libdir}/python* + %changelog * Fri May 25 2007 - mls@suse.de - fix unicode queries ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.Jn9926/_old 2007-11-23 01:37:47.000000000 +0100 +++ /var/tmp/diff_new_pack.Jn9926/_new 2007-11-23 01:37:47.000000000 +0100 @@ -20,7 +20,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 143 +Release: 148 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -127,6 +127,7 @@ Patch99: rpm-debugedit-shared.diff Patch100: rpm-gcc43.diff Patch101: lzma.diff +Patch102: rpm-shorten-changelog.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -197,7 +198,7 @@ %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 81 -P 82 -P 83 -P 84 -P 85 -P 86 -P 87 -P 88 -P 89 %patch -P 90 -P 91 -P 92 -P 93 -P 94 -P 95 -P 96 -P 97 -P 98 -P 99 -%patch -P 100 -P 101 +%patch -P 100 -P 101 -P 102 chmod 755 scripts/find-supplements{,.ksyms} chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms tar -xjvf %{SOURCE1} @@ -341,10 +342,10 @@ %package -n popt Summary: A C library for parsing command line parameters -License: LGPL v2 or later +License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 371 +Release: 376 # %description -n popt @@ -364,10 +365,10 @@ %package -n popt-devel Summary: C Library for Parsing Command Line Parameters -License: LGPL v2 or later +License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 371 +Release: 376 Requires: popt = 1.7 Requires: glibc-devel @@ -400,7 +401,11 @@ /usr/include/popt.h /%{_lib}/libpopt.so %doc %{_mandir}/man3/popt.3* + %changelog +* Fri Nov 16 2007 - dmueller@suse.de +- shorten changelogs in binary rpms (#308569) + * saves 4.3MB for the one CD media * Thu Oct 11 2007 - schwab@suse.de - Add support for lzma compressed archives. * Sun Sep 30 2007 - rguenther@suse.de ++++++ rpm-shorten-changelog.diff ++++++ --- build/parseChangelog.c +++ build/parseChangelog.c @@ -111,10 +111,11 @@ static int dateToTimet(const char * datestr, /*@out@*/ time_t * secs) static int addChangelog(Header h, StringBuf sb) /*@modifies h @*/ { - char *s; + char *s, *p; int i; time_t time; time_t lastTime = 0; + time_t cutOffTime = 1151704800; /* date -d "2006/07/01" +%s #SLES10-GA */ char *date, *name, *text, *next; s = getStringBuf(sb); @@ -167,6 +168,12 @@ static int addChangelog(Header h, StringBuf sb) return RPMERR_BADSPEC; } + /* workaround old suse oddity */ + if (*s == '-') { + ++s; + SKIPSPACE(s); + } + /* name */ name = s; while (*s != '\0') s++; @@ -178,6 +185,13 @@ static int addChangelog(Header h, StringBuf sb) return RPMERR_BADSPEC; } + /* remove domain part of the email address */ + p = strstr(name, "@suse"); + if (!p) + p = strstr(name, "@novell"); + if (p) + *p = '\0'; + /* text */ SKIPSPACE(text); if (! *text) { @@ -198,7 +212,8 @@ static int addChangelog(Header h, StringBuf sb) *s-- = '\0'; } - addChangelogEntry(h, time, name, text); + if (time >= cutOffTime) + addChangelogEntry(h, time, name, text); s = next; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org