diff options
author | Nathan Scott <nathans@sgi.com> | 2001-01-30 05:42:55 +0000 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2001-01-30 05:42:55 +0000 |
commit | 980d2ff8a7ea540118622d64e5f38624180c6552 (patch) | |
tree | 6f476ced084d2aa98faefc15d7a9e3ec4a25c74f | |
parent | 686fdb7d92210612c41f17beaf619753f26faa6a (diff) | |
download | dmapi-dev-980d2ff8a7ea540118622d64e5f38624180c6552.tar.gz |
roll minor version for packaging changes.
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | build/rpm/Makefile | 2 | ||||
-rw-r--r-- | build/rpm/dmapi.spec.in | 15 | ||||
-rw-r--r-- | doc/CHANGES | 3 |
4 files changed, 17 insertions, 5 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=0 PKG_MINOR=1 -PKG_REVISION=0 +PKG_REVISION=1 PKG_BUILD=0 diff --git a/build/rpm/Makefile b/build/rpm/Makefile index bd7eefe..b5ad808 100644 --- a/build/rpm/Makefile +++ b/build/rpm/Makefile @@ -72,5 +72,7 @@ ${SPECF} : ${SPECF}.in -e's|@pkg_var_dir@|$(PKG_VAR_DIR)|g' \ -e's|@pkg_share_dir@|$(PKG_SHARE_DIR)|g' \ -e's|@pkg_log_dir@|$(PKG_LOG_DIR)|g' \ + -e's|@pkg_doc_dir@|$(PKG_DOC_DIR)|g' \ + -e's|@pkg_man_dir@|$(PKG_MAN_DIR)|g' \ -e's|@pkg_tmp_dir@|$(PKG_TMP_DIR)|g' \ -e's|@make@|$(MAKE)|g' < $< > $@ diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in index bd997b6..936e711 100644 --- a/build/rpm/dmapi.spec.in +++ b/build/rpm/dmapi.spec.in @@ -57,11 +57,18 @@ files() { sort | uniq | awk ' $1 == "d" { printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $5); } -$1 == "f" { if (match ($6, "@pkg_man_dir@") || match ($6, "@pkg_doc_dir@")) { +$1 == "f" { if (match ($6, "@pkg_man_dir@") || match ($6, "@pkg_doc_dir@")) printf ("%%%%doc "); - } - printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } -$1 == "l" { print "%attr(0777,root,root)", $3; }' + if (match ($6, "@pkg_man_dir@")) + printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6); + else + printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); } +$1 == "l" { if (match ($3, "@pkg_man_dir@") || match ($3, "@pkg_doc_dir@")) + printf ("%%%%doc "); + if (match ($3, "@pkg_man_dir@")) + printf ("%attr(0777,root,root) %s*\n", $3); + else + printf ("%attr(0777,root,root) %s\n", $3); }' } set +x files < "$DIST_INSTALL" > files.rpm diff --git a/doc/CHANGES b/doc/CHANGES index 1428d69..2351eb4 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,7 @@ +dmapi-0.1.1 (30 January 2001) + - minor rpm and deb packaging work + dmapi-0.1.0 (15 January 2001) - initial version of package - early alpha code |