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 | 8b69151ac71ba1a5ede69890f1e30123e1c6157f (patch) | |
| tree | b5fc59abff4963191a9b14c7fdf555635a4ab620 /build | |
| parent | 7ece15d9a07328425cabcb01ce7f1161276a3b38 (diff) | |
| download | attr-8b69151ac71ba1a5ede69890f1e30123e1c6157f.tar.gz | |
roll minor version for packaging changes.
Diffstat (limited to 'build')
| -rw-r--r-- | build/rpm/Makefile | 2 | ||||
| -rw-r--r-- | build/rpm/attr.spec.in | 15 |
2 files changed, 13 insertions, 4 deletions
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/attr.spec.in b/build/rpm/attr.spec.in index a51c7d1..54dfdb7 100644 --- a/build/rpm/attr.spec.in +++ b/build/rpm/attr.spec.in @@ -58,11 +58,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 |