diff options
| -rw-r--r-- | Makefile.in | 16 | ||||
| -rw-r--r-- | quilt.changes | 12 | ||||
| -rw-r--r-- | quilt.spec.in | 7 |
3 files changed, 20 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 1303dab..3b4aade 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,14 +197,14 @@ $(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure $(PACKAGE).spec configure : configure.ac autoconf -$(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ - scripts/parse-patch - @echo "Generating spec file" - @sed -e 's/^\(Version:[ \t]*\).*/\1$(VERSION)/' \ - -e 's/^\(Release:[ \t]\).*/\1$(RELEASE)/' \ - < $< > $@ - @./changes2changelog $(PACKAGE).changes \ - | scripts/parse-patch -u changelog $@ +$(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile + @echo "Generating spec file" ; \ + set -e ; \ + changelog="$$(./changes2changelog $(PACKAGE).changes)" ; \ + awk '{ gsub(/@VERSION''@/, "$(VERSION)") ; \ + gsub(/@RELEASE''@/, "$(RELEASE)") ; \ + gsub(/@CHANGELOG''@/, changelog) ; \ + print }' changelog="$$changelog" $< > $@ % : %.in Makefile @echo "$< -> $@" >&2 diff --git a/quilt.changes b/quilt.changes index 4c225c0..236d5fa 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 15 15:20:27 CEST 2005 - agruen@suse.de + +- Fix quilt.spec generation after the Sep 14 change. + +------------------------------------------------------------------- Thu Sep 15 12:33:32 CEST 2005 - agruen@suse.de - quilt/pop.in: get rid of tac. @@ -178,9 +183,10 @@ Fri Aug 12 20:28:59 CEST 2005 - khali@linux-fr.org ------------------------------------------------------------------- Thu Aug 11 18:43:38 CEST 2005 - mquinson@debian.org -[Joe Green] -- bash_completion: add completion of the header command. -- improve description of the import command. +- bash_completion: add completion of the header command + [Joe Green]. +- improve description of the import command + [Joe Green]. ------------------------------------------------------------------- Fri Jul 29 18:56:58 CEST 2005 - khali@linux-fr.org diff --git a/quilt.spec.in b/quilt.spec.in index e721a2d..32987ea 100644 --- a/quilt.spec.in +++ b/quilt.spec.in @@ -6,8 +6,8 @@ Name: quilt Summary: Scripts for working with series of patches License: GPL Group: Productivity/Text/Utilities -Version: 0 -Release: 0 +Version: @VERSION@ +Release: @RELEASE@ Requires: coreutils diffutils patch gzip bzip2 perl mktemp gettext Autoreqprov: off Source: quilt-%{version}.tar.gz @@ -56,5 +56,4 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version}/quilt.pdf %changelog -# The changelog is filled in by "make quilt.spec". - +@CHANGELOG@ |