[OS-BUILD PATCH] Fix RHDISTGIT for Fedora

From: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; Fix RHDISTGIT for Fedora While the existing setup worked fine for users not setting up an RHDISTGIT_CACHE, it fails once you do because there was no entry to properly push to the Fedora dist-git. Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org&gt; diff --git a/redhat/Makefile.rhpkg b/redhat/Makefile.rhpkg index blahblah..blahblah 100644 --- a/redhat/Makefile.rhpkg +++ b/redhat/Makefile.rhpkg @@ -27,13 +27,15 @@ ifeq ("$(RHDISTGIT_CACHE)", "") endif endif -ifneq ("$(DISTRO)", "centos") - RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" -else +ifeq ("$(DISTRO)", "fedora") + RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.fedoraproject.org/rpms/$(PACKAGE_NAME)" +else ifeq ("$(DISTRO)", "centos") # CentOS uses a fork + merge request based workflow with dist-git to # handle changes, so you need to provide the gitlab username and we by # default set the default user's fork path. The dist-git target in # redhat/Makefile has a check to see if the variable is not set. GL_FORK_PATH?=$(PACKAGE_NAME).git RHDISTGIT:=git@gitlab.com:$(GL_DISTGIT_USER)/$(GL_FORK_PATH) +else + RHDISTGIT:="ssh://$(RHDISTGIT_USER)@pkgs.devel.redhat.com/rpms/$(PACKAGE_NAME)" endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1683