diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-07-23 10:42:21 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-07-23 10:42:21 +0000 |
| commit | e56a7949db331f7c6703bae4c38b1445747a5918 (patch) | |
| tree | be0a75f2b59815c62306aafb403cad257d4c6a27 | |
| parent | 38537ab38d027b04554708b91d9f6a1c339a85e6 (diff) | |
| download | quilt-e56a7949db331f7c6703bae4c38b1445747a5918.tar.gz | |
- Update spec2series accordingly.
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | quilt.changes | 1 | ||||
| -rwxr-xr-x | scripts/spec2series.in | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 61eec87..c9ac0e4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -188,7 +188,8 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ -e 's:@PACKAGE_BUGREPORT''@:$(PACKAGE_BUGREPORT):g' \ -e 's:@VERSION''@:$(VERSION):g' \ -e 's:@RELEASE''@:$(RELEASE):g' \ - -e 's:@DIFFSTAT''@:$(DIFFSTAT):g' \ + -e 's:@RPMBUILD''@:$(RPMBUILD):g' \ + -e 's:@DIFFSTAT''@:$(DIFFSTAT):g' \ $< > $@ @chmod --reference=$< $@ diff --git a/quilt.changes b/quilt.changes index e4cb1dd..110b4fd 100644 --- a/quilt.changes +++ b/quilt.changes @@ -2,6 +2,7 @@ Wed Jul 23 11:44:24 CEST 2003 - agruen@suse.de - Add Autoconf test for rpmbuild vs. rpm (needed for `make rpm'). +- Update spec2series accordingly. ------------------------------------------------------------------- Sun Jul 20 00:31:53 CEST 2003 - agruen@suse.de diff --git a/scripts/spec2series.in b/scripts/spec2series.in index 8d1c0aa..8c7a301 100755 --- a/scripts/spec2series.in +++ b/scripts/spec2series.in @@ -100,7 +100,7 @@ done) > $WORK/md5sum echo $" done" >&2 # prepare rpm dir fixups and hooks -RPM="rpm --rcfile=/usr/lib/rpm/rpmrc:$WORK/rpmrc" +RPM="@RPMBUILD@ --rcfile=/usr/lib/rpm/rpmrc:$WORK/rpmrc" PATH="$WORK/bin:$PATH" grep ^macrofiles /usr/lib/rpm/rpmrc \ | @SED@ -e "/macrofiles/s|$|:$WORK/rpmmacros|" \ @@ -186,7 +186,7 @@ chmod 755 "$WORK/bin/patch" ln -s patch "$WORK/bin/tar" # let rpm do all the dirty specfile stuff ... -echo -n "### rpm: " >&2 +echo -n "### $(basename @RPMBUILD@): " >&2 touch $WORK/patchlog $RPM --nodeps --quiet -bp "$specdir/$specfile" </dev/null echo $" done" >&2 |