diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-11-15 07:58:58 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-11-15 07:58:58 +0000 |
| commit | 26c7e9c357a45e7afe462708eb6232d72df80469 (patch) | |
| tree | 7ed81c7d8fd22e18958df1721d6fc8586405c933 | |
| parent | e6b7fa27ca8e9fd9bd59f4bc6a897060d0eac95a (diff) | |
| download | quilt-26c7e9c357a45e7afe462708eb6232d72df80469.tar.gz | |
- Merge some changes from wangdi:
+ Use -f (force) option of GNU patch in `quilt diff -z'.
+ Build source and binary RPMs in `make rpm' target.
+ Simplify sed expression in Makefile.in.
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | quilt/diff.in | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 4ffa1e5..5c254db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -109,7 +109,7 @@ dist : clean $(PACKAGE)-$(VERSION).tar.gz snapshot : $(PACKAGE)-$(ISODATE).tar.bz2 rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz - $(RPMBUILD) -tb $< + $(RPMBUILD) -ta $< doc/README : doc/README.in @echo README.in -> README @@ -132,8 +132,7 @@ reference : $(QUILT:%=quilt/%) echo; \ (bash -c ". scripts/patchfns ;LC_ALL=C . $$i -h"); \ done | \ - sed -e '/^Usage: \?/ {s/^Usage: \?// ; p ; d}' \ - -e 's/^/ /' + sed -e 's/^Usage: \?//' -e 's/^/ /' bin/guards.1 : bin/guards mkdir -p $$(dirname $@) diff --git a/quilt.changes b/quilt.changes index 5ccb79c..1f7f938 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sat Nov 15 08:44:19 CET 2003 - agruen@suse.de + +- Merge some changes from wangdi: + + Use -f (force) option of GNU patch in `quilt diff -z'. + + Build source and binary RPMs in `make rpm' target. + + Simplify sed expression in Makefile.in. + +------------------------------------------------------------------- Wed Nov 12 01:37:17 CET 2003 - agruen@suse.de - Add introductory paper to CVS repository. diff --git a/quilt/diff.in b/quilt/diff.in index 6cb5c8a..bab0c8e 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -255,7 +255,7 @@ then then if ! cat_file $pwd/$patch_file \ | @PATCH@ $patch_args --no-backup-if-mismatch \ - -E >/dev/null 2>/dev/null + -Ef >/dev/null 2>/dev/null then # If a patch was force applied (and therefore needs # refreshing), we know that patching the temporary |