From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 16 Apr 2003 07:48:15 +0000 (+0000)
Subject: - changelog should work better now - don't mess with old-style entries
X-Git-Tag: auto/ac/rpm-4_3-0_20030610_22~63
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=dae2a065f6acc9ff21acd4fd5a223ef71c0a2767;p=packages%2Frpm-build-tools.git

- changelog should work better now - don't mess with old-style entries

Changed files:
    adapter.awk -> 1.115
---

diff --git a/adapter.awk b/adapter.awk
index 2d4d643..bf7d62c 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -271,25 +271,29 @@ defattr == 1 {
 /^%changelog/, (/^%[a-z]+$/ && !/^%changelog/) {
 	preamble = 0
 	has_changelog = 1
+	skip = 0
 	# There should be some CVS keywords on the first line of %changelog.
-	if (boc == 1) {
-		if (!/^$/) {
-			if (!/\$.*Log:.*\$/)
-				print "$" "Log:$" > changelog_file
-			boc = 0
-		}
+	if (boc == 3) {
+		if (!/PLD Team/)
+			print "* %{date} PLD Team <feedback@pld.org.pl>" > changelog_file
+		else
+			skip = 1
+		boc = 2
 	}
-	if (boc == 2) {
+	if (boc == 2 && !skip) {
 		if (!/All persons listed below/) {
 			printf "All persons listed below can be reached at " > changelog_file
 			print "<cvs_login>@pld.org.pl\n" > changelog_file
-		}
+		} else
+			skip = 1
 		boc = 1
 	}
-	if (boc == 3) {
-		if (!/PLD Team/)
-			print "* %{date} PLD Team <feedback@pld.org.pl>" > changelog_file
-		boc = 2
+	if (boc == 1 && !skip) {
+		if (!/^$/) {
+			if (!/\$.*Log:.*\$/)
+				print "$" "Log:$" > changelog_file
+			boc = 0
+		}
 	}
 	# Define date macro.
 	if (boc == 4) {