SOURCES: rpm-truncate-cvslog.patch - fix merge
glen
glen at pld-linux.org
Thu May 4 21:36:25 CEST 2006
Author: glen Date: Thu May 4 19:36:25 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fix merge
---- Files affected:
SOURCES:
rpm-truncate-cvslog.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/rpm-truncate-cvslog.patch
diff -u SOURCES/rpm-truncate-cvslog.patch:1.2 SOURCES/rpm-truncate-cvslog.patch:1.3
--- SOURCES/rpm-truncate-cvslog.patch:1.2 Tue May 2 18:47:19 2006
+++ SOURCES/rpm-truncate-cvslog.patch Thu May 4 21:36:20 2006
@@ -11,6 +11,14 @@
void addChangelogEntry(Header h, time_t time, const char *name, const char *text)
{
int_32 mytime = time; /* XXX convert to header representation */
+@@ -123,6 +123,7 @@
+ int nentries = 0;
+ static time_t last = 0;
+ static int oneshot = 0;
++ int numchangelog = rpmExpandNumeric("%{?_buildchangelogtruncate}");
+
+ /* Determine changelog truncation criteria. */
+ if (!oneshot++) {
@@ -222,6 +223,42 @@
/* backup to end of description */
while ((s > text) && xisspace(*s))
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-truncate-cvslog.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list