X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=1c08bff6e6fa7cb68733ac243b1fddb6a4b20063;hb=5324bda8dbb31613640901bfba9b0dd339bc9616;hp=c3803340961b09e0e3196ff702afea7e088916de;hpb=6fd6ea1bfd5ecb4ab06e301bfe911cbb1de7e7f3;p=goaljobs-goals.git diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml index c380334..1c08bff 100644 --- a/libguestfs_fedora.ml +++ b/libguestfs_fedora.ml @@ -22,11 +22,11 @@ let package = "libguestfs" (* How branches in libguestfs upstream map to branches in Fedora. *) let branches = [ - "1.26-stable", "f20"; (* F20 follows 1.26. *) - "1.28-stable", "f21"; (* F21 follows 1.28. *) - "1.30-stable", "f22"; (* F22 follows 1.30. *) - "1.30-stable", "f23"; (* F23 follows 1.30. *) - "1.31-development", "master"; (* Rawhide follows development. *) +(* "1.41-development", "master"; (* Rawhide follows development. *)*) + "1.40-stable", "master"; + "1.40-stable", "f29"; (* F29 follows development. *) + "1.38-stable", "f28"; (* F28 follows 1.38. *) + "1.38-stable", "f27"; (* F27 follows 1.38. *) ] (* Goal: Latest website version has been built in every branch. *) @@ -64,10 +64,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