X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=991e202891a4f63e45fa4f945aa6c090b5db83cd;hb=refs%2Fheads%2Fmaster;hp=dbcda32b2a628e5d3511b53c038ca24e91341f5e;hpb=31f47bf9057500f59ae88739079d462c275c3139;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index dbcda32..991e202 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,12 +22,10 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
-  "1.37-development", "master";    (* Rawhide follows development. *)
-  "1.36-stable", "f26";            (* F26 follows 1.36. *)
-  "1.36-stable", "f25";            (* F25 follows 1.36. *)
-  "1.34-stable", "f24";            (* F24 follows 1.34. *)
-  "1.32-stable", "f23";            (* F23 follows 1.32. *)
-  "1.30-stable", "f22";            (* F22 follows 1.30. *)
+  "1.41-development", "master";    (* Rawhide follows development. *)
+  "1.40-stable", "f31";            (* F31 follows development. *)
+  "1.40-stable", "f30";            (* F30 follows development. *)
+  "1.40-stable", "f29";            (* F29 follows development. *)
 ]
 
 (* Goal: Latest website version has been built in every branch. *)
@@ -65,10 +63,19 @@ and sources_uploaded version branch =
 
   require (repodir_up_to_date repodir);
 
-  sh "
-    cd %s
-    fedpkg new-sources %s/%s
-  " repodir libguestfs_website_repo version.urlpath
+  if not version.is_stable then (
+    sh "
+      cd %s
+      fedpkg new-sources %s/%s
+    " repodir libguestfs_download_repo version.urlpath
+  ) else (
+    sh "
+      cd %s
+      fedpkg new-sources %s/%s %s/%s.sig
+    "  repodir
+       libguestfs_download_repo version.urlpath
+       libguestfs_download_repo version.urlpath
+  )
 
 and specfile_updated version branch =
   let repodir = fedora_repo package branch in