There are 34 patches to the upstream 6.2 tarball in the fedora (aka
redhat) packaging repo,

  https://src.fedoraproject.org/rpms/am-utils.git

Of these, 18 start with the line "commit XXXXX" where XXXX is a git
commit ID from the upstream git repo for a commit done on the upstream
mainline post-6.2.

Of the remaining 16, all but four are already present in the upstream
mainline post-6.2. These are the last four (4) listed in the
am-utils.spec file:

Patch31: am-utils-6.2-use-linux-libtirpc-if-present.patch
Patch32: am-utils-6.2-fix-compiler-assignment-warning-due-to-libtirpc.patch
Patch33: am-utils-6.2-fix-logical-not-comparison-in-get_ldap_timestamp.patch
Patch34: am-utils-6.2-fix-umount-to-mount-race.patch

I'm going to push the repo I made with all the above to the existing
but empty am-utils collab-maint repo. There are tags

    patches-fedora-6.2.0-ported-ad416c86
    (the above four fedora patches, applied to the tip of the upstream main)

    patches-fedora-6.2.0
    (all fedora patches, applied to the commit from which the upstream
6.2 tarball was built)

    tarball_6.2_made_here
    (the commit on which upstream tarball 6.2 was built)

    tarball_6.2
    (a snapshot containing precisely the upstream 6.2 tarball)

and branches upstream-master for the master branch of the upstream
repo, and master for the debian packaging, which is rooted in an
import of all the available Debian history.

The fedora packaging repo also contains some support files for systemd
and such, which should probably be merged into the Debian package.

I'm extending debian/README.source to discuss the above, instead of
just giving a pointer to quilt (which should be removed when the
packaging is updated).

Reply via email to