From bfd3ffac7c5c88585c543322f5c8c091bcf396ae Mon Sep 17 00:00:00 2001
From: ben <ben@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>
Date: Fri, 19 Jul 2002 05:54:31 +0000
Subject: Added man page to RPM, makerpm no longer requires root

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@163 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
---
 rdiff-backup/dist/makerpm           | 19 +++++++++++++------
 rdiff-backup/dist/rdiff-backup.spec |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/rdiff-backup/dist/makerpm b/rdiff-backup/dist/makerpm
index 1fa2c32..8f59f65 100755
--- a/rdiff-backup/dist/makerpm
+++ b/rdiff-backup/dist/makerpm
@@ -18,10 +18,17 @@ i386rpm = base+".i386.rpm"
 source_rpm = base+".src.rpm"
 tarfile = "-".join(base.split("-")[:-1]) + ".tar.gz"
 
-assert not os.system("install -o root -g root -m 644 %s "
-					 "/usr/src/redhat/SOURCES" % (tarfile,))
+# These assume the rpm root directory $HOME/rpm.  The
+# nonstandard location allows for building by non-root user.
+assert not os.system("cp %s $HOME/rpm/SOURCES" % (tarfile,))
 assert not os.system("rpm -ba --sign -vv --target i386 " + specfile)
-assert not os.system("install -o ben -g ben -m 644 "
-					 "/usr/src/redhat/RPMS/i386/%s ." % i386rpm)
-assert not os.system("install -o ben -g ben -m 644 "
-					 "/usr/src/redhat/SRPMS/%s ." % source_rpm)
+assert not os.system("cp $HOME/rpm/RPMS/i386/%s ." % i386rpm)
+assert not os.system("cp $HOME/rpm/SRPMS/%s ." % source_rpm)
+
+# Old root RPM instructions
+#assert not os.system("install -o root -g root -m 644 %s "
+#					 "/usr/src/redhat/SOURCES" % (tarfile,))
+#assert not os.system("install -o ben -g ben -m 644 "
+#					 "/usr/src/redhat/RPMS/i386/%s ." % i386rpm)
+#assert not os.system("install -o ben -g ben -m 644 "
+#					 "/usr/src/redhat/SRPMS/%s ." % source_rpm)
diff --git a/rdiff-backup/dist/rdiff-backup.spec b/rdiff-backup/dist/rdiff-backup.spec
index 586fdd5..68b24b9 100644
--- a/rdiff-backup/dist/rdiff-backup.spec
+++ b/rdiff-backup/dist/rdiff-backup.spec
@@ -36,6 +36,7 @@ python2 setup.py install --prefix=$RPM_BUILD_ROOT/usr
 %defattr(-,root,root)
 /usr/bin/rdiff-backup
 /usr/share/doc/rdiff-backup-%{version}
+/usr/share/man/man1
 /usr/lib
 
 
-- 
cgit v1.2.1