- -5/-a5 implies -ncs (who likes cvs up -A when updating on branch?)

[packages/rpm-build-tools.git] / adapter.awk

diff --git a/adapter.awk b/adapter.awk
index 2d4d6431f853179b00aca0a7c57fe9948f3c9c99..51cb719b179d7dbf1f4a2171a350ccd8d9ed0f6f 100644 (file)
--- 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-linux.org>" > 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
-               }
+                       print "<cvs_login>@pld-linux.org\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) {
@@ -505,10 +509,10 @@ END {
                print "%changelog"
 
        if (boc > 2)
-               print "* %{date} PLD Team <feedback@pld.org.pl>"
+               print "* %{date} PLD Team <feedback@pld-linux.org>"
        if (boc > 1) {
                printf "All persons listed below can be reached at "
-               print "<cvs_login>@pld.org.pl\n"
+               print "<cvs_login>@pld-linux.org\n"
        }
        if (boc > 0)
                print "$" "Log:$"