Now build both Fedora and ordinary rpms

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@427 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

1 files changed, 13 insertions, 3 deletions

diff --git a/rdiff-backup/dist/makerpm b/rdiff-backup/dist/makerpm
index bf5fbee..f67a490 100755
--- a/rdiff-backup/dist/makerpm
+++ b/rdiff-backup/dist/makerpm
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+#
+# Builds two rpms, one for generic release, and the other for the
+# Fedora project.
 
 import os, sys
 
@@ -7,22 +10,29 @@ rpmroot = os.path.join(os.environ['HOME'], 'rpm')
 if len(sys.argv) == 2:
 	Version = sys.argv[1]
 	specfile = "rdiff-backup.spec"
-	print "Using specfile %s" % specfile
+	fedora_specfile = "rdiff-backup.spec-fedora"
+	print "Using specfiles %s, %s" % (specfile, fedora_specfile)
 else:
 	print "Syntax:  %s version_number" % sys.argv[0]
 	sys.exit(1)
 
 base = "rdiff-backup-%s" % (Version,)
 tarfile = base + ".tar.gz"
-rpmbase = base + "-0.fdr.4" # Fedora suffix, with release number 4
+rpmbase = base + "-1"
 i386_rpm = rpmbase + ".i386.rpm"
 source_rpm = rpmbase + ".src.rpm"
 
+fedora_rpmbase = base + "-0.fdr.1"
+fedora_i386_rpm = fedora_rpmbase + ".i386.rpm"
+fedora_source_rpm = fedora_rpmbase + ".src.rpm"
+
 # These assume the rpm root directory $HOME/rpm.  The
 # nonstandard location allows for building by non-root user.
 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 --sign " + specfile)
 assert not os.system("mv %s/RPMS/i386/%s ." % (rpmroot, i386_rpm))
 assert not os.system("mv %s/SRPMS/%s ." % (rpmroot, source_rpm))
 
+assert not os.system("rpmbuild -ba -v --sign " + fedora_specfile)
+assert not os.system("mv %s/RPMS/i386/%s ." % (rpmroot, fedora_i386_rpm))
+assert not os.system("mv %s/SRPMS/%s ." % (rpmroot, fedora_source_rpm))