Rewrite awk magic to generate spec file changelog.

diff --git a/config/ChangeLog b/config/ChangeLog
index 3ebb9c0..0c50373 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-24  Roland McGrath  <roland@redhat.com>
+
+       * Makefile.am ($(srcdir)/elfutils.spec.in): Rewrite awk magic.
+       Put the target inside [if MAINTAINER_MODE].
+
 2008-12-16  Roland McGrath  <roland@redhat.com>
 
        * version.h.in: New file.

diff --git a/config/Makefile.am b/config/Makefile.am
index 60e9bfe..f2db4ef 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Configure input file for elfutils.
 ##
-## Copyright (C) 2004, 2005 Red Hat, Inc.
+## Copyright (C) 2004, 2005, 2008 Red Hat, Inc.
 ## This file is part of Red Hat elfutils.
 ##
 ## Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -27,21 +27,22 @@
 ##
 EXTRA_DIST = elfutils.spec.in
 
+if MAINTAINER_MODE
 $(srcdir)/elfutils.spec.in: $(top_srcdir)/NEWS
        @tmpname=$$(mktemp $${TMPDIR:-/tmp}/elfutils.XXXXXX); \
        date +'* %a %b %e %Y' | tr '[\n]' '[ ]' > $$tmpname; \
        getent passwd "$$(whoami)" | \
          awk 'BEGIN {FS=":"} { printf $$5; exit 0}' >> $$tmpname; \
        echo -n " <$$(whoami)@redhat.com> " >> $$tmpname; \
-       sed 's/Version \(.*\):$$/\1-1/;q' $(top_srcdir)/NEWS >> $$tmpname; \
-       sed '2,/^Version /p;d' $(top_srcdir)/NEWS | \
-         head -n -1 | \
-         awk '{ if ($$0 == "") { if (line != "") { printf "- "; fflush(); system("echo \"" line "\" | fold -w 70"); line=""; } } else { line=line $$0; }} END { if (line != "") { printf "- "; system("echo \"" line "\" | fold -w 70")}}' >> $$tmpname; \
-       echo >> $$tmpname; \
+       awk '\
+         $$1 == "Version" && started { exit } \
+         $$1 == "Version" { started=1; line=""; sub(/:/,"",$$2); \
+                            print $$2 "-1"; next } \
+         NF > 0 { line = (line != "") ? (line " " $$0) : ("- " $$0) } \
+         NF == 0 && line != "" { print line; line="" } \
+         END { if (line != "") print line; print "" }' $< \
+       | fold -s -w 70 | sed '1!s/^[^-]/  &/' >> $$tmpname; \
        sed "/^%changelog/r $$tmpname" $@ > $@.new; \
        rm -f $$tmpname; \
        mv -f $@.new $@
-       -@if [ -d $(srcdir)/CVS ]; then \
-         cd $(srcdir); \
-         cvs ci -m "Added changelog." $(@F); \
-       fi
+endif