summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2014-04-17 13:22:08 +0200
committerJean Delvare <jdelvare@suse.de>2014-04-17 13:22:08 +0200
commit094d6d1f52b5cb7f229cb621262e47ee4f7707ec (patch)
treed461e88673d7e185c5a635e7982c5ff33ffd1c5a
parent530c39eca5d63b21020f31946142f6b6f6f1fa98 (diff)
downloadquilt-094d6d1f52b5cb7f229cb621262e47ee4f7707ec.tar.gz
Generate rpm's %changelog from NEWS
NEWS is much more appropriate than quilt.changes to feed the rpm spec file's %changelog section.
-rw-r--r--Makefile.in9
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 7634761..d03591a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ DIRT += $(shell $(FIND) . -name '*~')
DIRT += $(shell $(FIND) . -name '.\#*')
SRC += COPYING AUTHORS TODO Makefile.in configure.ac \
- config/install-sh quilt.spec.in quilt.changes \
+ config/install-sh quilt.spec.in NEWS \
bash_completion quilt.quiltrc aclocal.m4 git-desc
DIRT += quilt.spec
@@ -115,7 +115,6 @@ SRC += $(PO:%=po/%)
DIRT += po/*.mo po/*~
SRC += $(wildcard test/*.test) test/run test/test.quiltrc
-SRC += changes2changelog
NON_EXEC_IN := doc/quilt.1 doc/README quilt/scripts/patchfns quilt/scripts/utilfns
@@ -245,10 +244,12 @@ $(PACKAGE)-$(GIT_DESC).tar.bz2 : $(SRC) configure $(PACKAGE).spec
rm -f $(PACKAGE)-$(GIT_DESC)
@echo "File $@ created."
-$(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile
+$(PACKAGE).spec : $(PACKAGE).spec.in NEWS Makefile
@echo "Generating spec file" ; \
set -e ; \
- changelog="`./changes2changelog $(PACKAGE).changes`" ; \
+ changelog="`sed \
+ -e 's/^Version \([0-9.]*\) (\(.*\))/* \2 - upstream\n- Update to version \1/' \
+ -e 's/^ -/ +/' < NEWS`" ; \
$(AWK) '{ gsub(/@VERSION''@/, "$(VERSION)") ; \
gsub(/@RELEASE''@/, "$(RELEASE)") ; \
gsub(/@CHANGELOG''@/, changelog) ; \