{"id":15059270,"url":"https://github.com/fedora-python/ferrypick","last_synced_at":"2025-04-10T05:22:55.307Z","repository":{"id":57429101,"uuid":"268649720","full_name":"fedora-python/ferrypick","owner":"fedora-python","description":"Apply patches from Fedora dist git to different components.","archived":false,"fork":false,"pushed_at":"2020-10-08T15:24:41.000Z","size":18,"stargazers_count":2,"open_issues_count":2,"forks_count":4,"subscribers_count":8,"default_branch":"master","last_synced_at":"2025-03-24T06:45:21.986Z","etag":null,"topics":["cherry-pick","fedora","git","rpm"],"latest_commit_sha":null,"homepage":"","language":"Python","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"cc0-1.0","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/fedora-python.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null}},"created_at":"2020-06-01T22:51:32.000Z","updated_at":"2020-08-20T10:20:31.000Z","dependencies_parsed_at":"2022-08-26T10:20:34.800Z","dependency_job_id":null,"html_url":"https://github.com/fedora-python/ferrypick","commit_stats":null,"previous_names":[],"tags_count":2,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/fedora-python%2Fferrypick","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/fedora-python%2Fferrypick/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/fedora-python%2Fferrypick/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/fedora-python%2Fferrypick/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/fedora-python","download_url":"https://codeload.github.com/fedora-python/ferrypick/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":248054200,"owners_count":21039952,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["cherry-pick","fedora","git","rpm"],"created_at":"2024-09-24T22:40:22.000Z","updated_at":"2025-04-10T05:22:55.276Z","avatar_url":"https://github.com/fedora-python.png","language":"Python","funding_links":[],"categories":[],"sub_categories":[],"readme":"ferrypick\n=========\n\nApply patches from Fedora dist git to different components.\n\nThis simple tool does 3 steps:\n\n 1. download patch file from src.fedoraproject.org\n 2. replaces package name with current dist-git work dir package name\n 3. runs `git am --reject` on the product\n\nUsage:\n\n```\n[python36 (f32 %)]$ git switch -c f32-backport\nSwitched to a new branch 'f32-backport'\n\n[python36 (f32-backport %)]$ ferrypick https://src.fedoraproject.org/rpms/python3.6/pull-request/2\nDownloading https://src.fedoraproject.org/rpms/python3.6/pull-request/2.patch\n$ git am --reject /tmp/tmp7pa062j6.patch\nApplying: Fix python3-config --configdir\nChecking patch 00102-lib64.patch...\n.git/rebase-apply/patch:26: new blank line at EOF.\n+\nChecking patch 00205-make-libpl-respect-lib64.patch...\nChecking patch python36.spec...\nerror: while searching for:\n#global prerel ...\n%global upstream_version %{general_version}%{?prerel}\nVersion: %{general_version}%{?prerel:~%{prerel}}\nRelease: 4%{?dist}\nLicense: Python\n\n\n\nerror: patch failed: python36.spec:17\nerror: while searching for:\n# ======================================================\n\n%changelog\n* Wed May 06 2020 Miro Hrončok \u003cmhroncok@redhat.com\u003e - 3.6.10-4\n- Rename from python36 to python3.6\n\n\nerror: patch failed: python36.spec:1535\nApplied patch 00102-lib64.patch cleanly.\nApplied patch 00205-make-libpl-respect-lib64.patch cleanly.\nApplying patch python36.spec with 2 rejects...\nRejected hunk #1.\nHunk #2 applied cleanly.\nHunk #3 applied cleanly.\nRejected hunk #4.\nPatch failed at 0001 Fix python3-config --configdir\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nWhen you have resolved this problem, run \"git am --continue\".\nIf you prefer to skip this patch, run \"git am --skip\" instead.\nTo restore the original branch and stop patching, run \"git am --abort\".\n\n[python36 (f32-backport *%|AM 1/1)]$ cat python36.spec.rej\ndiff a/python36.spec b/python36.spec\t(rejected hunks)\n@@ -17,7 +17,7 @@ URL: https://www.python.org/\n #global prerel ...\n %global upstream_version %{general_version}%{?prerel}\n Version: %{general_version}%{?prerel:~%{prerel}}\n-Release: 4%{?dist}\n+Release: 5%{?dist}\n License: Python\n \n \n@@ -1535,6 +1529,9 @@ CheckPython optimized\n # ======================================================\n \n %changelog\n+* Thu May 28 2020 Victor Stinner \u003cvstinner@python.org\u003e - 3.6.10-5\n+- Fix python3-config --configdir (rhbz#1772988).\n+\n * Wed May 06 2020 Miro Hrončok \u003cmhroncok@redhat.com\u003e - 3.6.10-4\n - Rename from python36 to python3.6\n```\n\nEnjoy.\n\n\nBeware of non-utf-8 patches\n---------------------------\n\nPagure has a [bug with patches containing non-utf-8 content](https://pagure.io/pagure/issue/4901).\nHence if a commit contains such characters,\nalways generate the patch file locally (`git format-patch`) and use ferrypick with local patch file,\nuntil the problem is fixed.\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ffedora-python%2Fferrypick","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Ffedora-python%2Fferrypick","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Ffedora-python%2Fferrypick/lists"}