From b53bfd4d41252426cb050ef896676034d92e3ef7 Mon Sep 17 00:00:00 2001 From: bescoto Date: Tue, 31 Dec 2002 08:46:22 +0000 Subject: Various changes for v0.11.1 (see CHANGELOG) git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@256 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109 --- rdiff-backup/dist/makerpm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'rdiff-backup/dist/makerpm') diff --git a/rdiff-backup/dist/makerpm b/rdiff-backup/dist/makerpm index 8f59f65..2f275b2 100755 --- a/rdiff-backup/dist/makerpm +++ b/rdiff-backup/dist/makerpm @@ -2,7 +2,7 @@ import os, sys, re -SourceDir = "src" +rpmroot = "/home/ben/rpm" if len(sys.argv) == 2: version = sys.argv[1] @@ -20,15 +20,9 @@ tarfile = "-".join(base.split("-")[:-1]) + ".tar.gz" # 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("cp $HOME/rpm/RPMS/i386/%s ." % i386rpm) -assert not os.system("cp $HOME/rpm/SRPMS/%s ." % source_rpm) +assert not os.system("cp %s %s/SOURCES" % (tarfile, rpmroot)) +#assert not os.system("rpm -ba --sign -vv --target i386 " + specfile) +assert not os.system("rpmbuild -ba -v " + specfile) +assert not os.system("cp %s/RPMS/i386/%s ." % (rpmroot, i386rpm)) +assert not os.system("cp %s/SRPMS/%s ." % (rpmroot, 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) -- cgit v1.2.1