diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | build/rpm/Makefile | 2 | ||||
| -rw-r--r-- | build/rpm/attr.spec.in | 15 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | man/man2/Makefile | 5 | ||||
| -rw-r--r-- | man/man3/Makefile | 5 |
6 files changed, 21 insertions, 11 deletions
@@ -3,5 +3,5 @@ # PKG_MAJOR=1 PKG_MINOR=0 -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/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 diff --git a/doc/CHANGES b/doc/CHANGES index 1200095..47c7f38 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,7 @@ +attr-1.0.1 (30 January 2001) + - minor rpm and deb packaging work + attr-1.0.0 (15 January 2001) - extended attribute code abstracted from xfs-cmds package - completed Debian packaging diff --git a/man/man2/Makefile b/man/man2/Makefile index db1761c..544e219 100644 --- a/man/man2/Makefile +++ b/man/man2/Makefile @@ -39,11 +39,10 @@ MAN_PAGES = $(shell echo *.$(MAN_SECTION)) MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) LSRCFILES = $(MAN_PAGES) -default : $(MAN_PAGES) +default install : $(MAN_PAGES) include $(BUILDRULES) -install : default +install-dev : default $(INSTALL) -m 755 -d $(MAN_DEST) $(INSTALL_MAN) -install-dev: diff --git a/man/man3/Makefile b/man/man3/Makefile index abf2063..549c947 100644 --- a/man/man3/Makefile +++ b/man/man3/Makefile @@ -39,11 +39,10 @@ MAN_PAGES = $(shell echo *.$(MAN_SECTION)) MAN_DEST = $(PKG_MAN_DIR)/man$(MAN_SECTION) LSRCFILES = $(MAN_PAGES) -default : $(MAN_PAGES) +default install : $(MAN_PAGES) include $(BUILDRULES) -install : default +install-dev : default $(INSTALL) -m 755 -d $(MAN_DEST) $(INSTALL_MAN) -install-dev: |