roll minor version for packaging changes.

diff --git a/VERSION b/VERSION
index 5679d10fccb639e049bdde19f259c3e41ae4387d..76416ff2444a1ca874006b1cd89cbd6d2814a617 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=1
-PKG_REVISION=0
+PKG_REVISION=1
 PKG_BUILD=0

diff --git a/build/rpm/Makefile b/build/rpm/Makefile
index bd7eefe6f926058c6c50ab60ea8d5142876095f5..b5ad8089c4170b947ddecaddf2f275e8fd599afa 100644 (file)
--- 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/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index 4409305b54c408f7f13e894af9e712d96de87381..4234cde98c3dc621dce8258aa18f416e6d11c827 100644 (file)
--- a/build/rpm/xfsprogs.spec.in
+++ b/build/rpm/xfsprogs.spec.in
@@ -69,11 +69,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 9b293d337831c4217a8703d1ff34825bb5829682..60cea07b98680c0d6ece13a4c08e075cea1bcefc 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,7 @@
 
+xfsprogs-1.1.1 (30 January 2001)
+       - minor rpm and deb packaging work
+
 xfsprogs-1.1.0 (15 January 2001)
        - rework xfs-cmds package into base, devel and dump packages
        - completed Debian packaging