From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 7 Jan 2020 13:17:44 +0000 (+0000)
Subject: Allow fedpkg to be overridden, for building into different Koji profiles.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=9ffe2984f208c565b4adccdd8ea63a689bdd2d1b;hp=e5e3e316687b80d9b5c2ecd49a7093873e5903d4;p=fedora-ocaml-rebuild.git

Allow fedpkg to be overridden, for building into different Koji profiles.
---

diff --git a/Goalfile b/Goalfile
index 993f087..de5d406 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,6 +6,8 @@ let branch = "master"
 let side-tag = "f32-ocaml"
 #let koji = "koji"
 let koji = "koji -p riscv64"
+#let fedpkg = "fedpkg"
+let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
@@ -89,6 +91,7 @@ tactic *built-in-koji (pkg) = {
 goal rebuild (pkg) =
 *built-in-koji ("%pkg") : source-dependencies (pkg) {
     cd %fedora-dir/%pkg/%branch
+    fedpkg=%fedpkg
     koji=%koji
     specfile=%pkg.spec
 
@@ -105,15 +108,9 @@ goal rebuild (pkg) =
     else
         rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
     fi
-    fedpkg commit -c
-    fedpkg push
-    if [ "$koji" = "koji" ]; then
-        fedpkg build
-    else
-        hash=$(git rev-parse HEAD)
-        $koji build "git+https://src.fedoraproject.org/rpms/"%pkg".git#$hash" %side-tag
-    fi
-    exit 1
+    $fedpkg commit -c
+    $fedpkg push
+    $fedpkg build
 }
 
 # Get the source package names for a particular package.
diff --git a/fedpkg-user-config b/fedpkg-user-config
new file mode 100644
index 0000000..6160a06
--- /dev/null
+++ b/fedpkg-user-config
@@ -0,0 +1,2 @@
+[fedpkg]
+kojiprofile=riscv64