Currently PKI releases are made for specific distributions (i.e. Fedora, RHEL/CentOS) and distribution-specific changes are stored in the repository. This can make branching/tagging/cherry-picking difficult since there are many branches and tags to manage, for example:

• branch 10.2.0 (for releases 10.2.0-x)
• branch 10.2.1 (for releases 10.2.1-x)
• tag 10.2.0-1
• tag 10.2.0-2
• tag 10.2.1-1
• tag 10.2.1-2

The tags are distribution specific (e.g. Fedora and RHEL/CentOS cannot use the same tags). Branches have to be maintained independently for different distributions (i.e. cannot be rebased). Because of that cherry-picks have to be done very carefully, also it may not work if the patch contains distribution-specific changes.

To simplify this, PKI repository should contain no packaging branches/tags, for example:

• branch 10.2 (for releases 10.2.x)
• tag 10.2.0
• tag 10.2.1

and should produce generic releases (in .tgz instead of .rpm), for example:

• PKI 10.2.0
• PKI 10.2.1

Then each distribution is responsible to import the source and create its own releases, for example:

• Fedora PKI 10.2.1-2
• Debian PKI 10.2.1-1
• RHEL/CentOS PKI 10.2.0-1