From: Nathan Scott <nathans@sgi.com>
Date: Tue, 30 Jan 2001 05:42:55 +0000 (+0000)
Subject: roll minor version for packaging changes.
X-Git-Tag: v1.2.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca32a39c7fc17d11a15bda5f7e942f073f9afbb8;p=thirdparty%2Fxfsprogs-dev.git

roll minor version for packaging changes.
---

diff --git a/VERSION b/VERSION
index 5679d10fc..76416ff24 100644
--- 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 bd7eefe6f..b5ad8089c 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/xfsprogs.spec.in b/build/rpm/xfsprogs.spec.in
index 4409305b5..4234cde98 100644
--- 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 9b293d337..60cea07b9 100644
--- 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