[packages/rpm/dev-5.4.16] drop supporting building from cvs src.rpm
glen
glen at pld-linux.org
Sun May 15 17:32:29 CEST 2016
commit 7d28089696b714f7ff8f87e3dcbf85987df76dab
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun May 15 18:31:24 2016 +0300
drop supporting building from cvs src.rpm
the cvs $log output got truncated with cvs->git migration in 2012
rpm-truncate-cvslog.patch | 64 -----------------------------------------------
rpm.spec | 2 --
2 files changed, 66 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index e10d166..1ba0d5d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -112,7 +112,6 @@ Patch15: %{name}-debuginfo.patch
Patch16: vendor-pld.patch
Patch17: %{name}-old-fileconflicts-behaviour.patch
Patch18: %{name}-javadeps.patch
-Patch19: %{name}-truncate-cvslog.patch
Patch20: %{name}-libtool-deps.patch
Patch21: %{name}-mimetype.patch
Patch22: %{name}-sparc64.patch
@@ -889,7 +888,6 @@ cd -
%patch16 -p1
%patch17 -p1
%patch18 -p1
-%patch19 -p1
%patch20 -p1
%patch21 -p1
%ifarch sparc64
diff --git a/rpm-truncate-cvslog.patch b/rpm-truncate-cvslog.patch
deleted file mode 100644
index 5d9e977..0000000
--- a/rpm-truncate-cvslog.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-# vim:ts=8:sw=4
---- rpm-4.4.6/build/parseChangelog.c~ 2006-04-30 17:34:40.334393487 +0300
-+++ rpm-4.4.6/build/parseChangelog.c 2006-05-02 19:46:06.357193264 +0300
-@@ -8,6 +8,9 @@
- #include "rpmbuild.h"
- #include "debug.h"
-
-+#define CVS_RCSID "$""Log: "
-+#define CVS_REVISION "Revision "
-+
- 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))
- *s-- = '\0';
-+
-+ if (numchangelog && (s = strstr(text, CVS_RCSID))) {
-+ /* find end of line */
-+ while(*s && *s != '\n') s++;
-+ if (!*s) {
-+ goto out;
-+ }
-+ s++;
-+ if (!*s) {
-+ goto out;
-+ }
-+
-+ /* we reached place where first Revisions should be */
-+ i = 0;
-+ while (1) {
-+ if (strncmp(s, CVS_REVISION, sizeof(CVS_REVISION) - 1) == 0) {
-+ if (i++ == numchangelog) {
-+ break;
-+ }
-+ }
-+ while(*s && *s != '\n') s++;
-+ if (!*s) {
-+ break;
-+ }
-+ s++;
-+ }
-+
-+ if (*s) {
-+ s--;
-+ /* backup to the beginning of line */
-+ while ((s > text) && (*s == '\n' || xisspace(*s))) {
-+ *s-- = '\0';
-+ }
-+ }
-+ }
-+out:
-
- /* Add entry if not truncated. */
- nentries++;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/7d28089696b714f7ff8f87e3dcbf85987df76dab
More information about the pld-cvs-commit
mailing list