commit 6a2583724239b9834bd523c80ed4a7b57cac7ec2
Author: Jacek Konieczny <[email protected]>
Date: Tue Jul 24 15:07:46 2012 +0200
Do not enforce changelog order
GIT history is not linear and the log created by the builder script
may not be exactly as chronological as RPM expects.
rpm-changelog_order_check_nonfatal.patch | 13 +++++++++++++
rpm.spec | 1 +
2 files changed, 14 insertions(+)
---
diff --git a/rpm-changelog_order_check_nonfatal.patch
b/rpm-changelog_order_check_nonfatal.patch
new file mode 100644
index 0000000..bf2ef04
--- /dev/null
+++ b/rpm-changelog_order_check_nonfatal.patch
@@ -0,0 +1,13 @@
+--- rpm-4.5/build/parseChangelog.c.orig 2012-07-24 14:46:12.856158625
+0200
++++ rpm-4.5/build/parseChangelog.c 2012-07-24 14:47:55.293158624 +0200
+@@ -181,9 +181,8 @@
+ return RPMERR_BADSPEC;
+ }
+ if (lastTime && lastTime < time) {
+- rpmError(RPMERR_BADSPEC,
++ rpmMessage(RPMMESS_WARNING,
+ _("%%changelog not in descending chronological order\n"));
+- return RPMERR_BADSPEC;
+ }
+ lastTime = time;
+
diff --git a/rpm.spec b/rpm.spec
index 2a881d7..9855d15 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -188,6 +188,7 @@ Patch104: %{name}-glob.patch
Patch105: %{name}-am.patch
Patch106: %{name}-automake_1.12.patch
Patch107: %{name}-debugedit-dwarf4.patch
+Patch108: %{name}-changelog_order_check_nonfatal.patch
URL: http://rpm5.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1.4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
