Notes on pushing a package update (and backport to other supported Fedora releases) for a new upstream release with `fedpkg` ========================================================================= Pushing an update to Rawhide ---------------------------- 0) Ensure you're on the 'master' branch of 'gerrymander' Fedora package: $ git branch f20 * master 1) Upload the new source tarball: $ fedpkg new-sources ~/rpmbuild/SOURCES/gerrymander-1.4.tar.gz Uploading: 00bdbd453789c645efc1c9dbdd8df333 /home/kashyap/rpmbuild/SOURCES/gerrymander-1.4.tar.gz 2) Modify the SPEC file to update to new release: $ git diff diff --git a/.gitignore b/.gitignore index 85f32fc..54989be 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /v1.3.tar.gz +/gerrymander-1.4.tar.gz diff --git a/gerrymander.spec b/gerrymander.spec index e86eb75..2f936ac 100644 --- a/gerrymander.spec +++ b/gerrymander.spec @@ -1,10 +1,10 @@ Summary: The gerrit client tools Name: gerrymander -Version: 1.3 -Release: 4%{?dist} -Source0: https://github.com/berrange/%{name}/archive/v%{version}.tar.gz -URL: http://github.com/berrange/gerrymander +Version: 1.4 +Release: 1%{?dist} +Source0: https://pypi.python.org/packages/source/g/%{name}/%{name}-%{version}.tar.gz +URL: https://pypi.python.org/pypi/gerrymander License: ASL 2.0 Group: Development/Libraries @@ -79,6 +79,11 @@ rm -rf *.egg-info %{python3_sitelib}/%{name}-%{version}-py3.*.egg-info %changelog +* Fri Jan 09 2015 Kashyap Chamarthy - 1.4.1 +- Update to new upstream release 1.4 +- Change the official source to pypi (from github generated tarballs) +- Change the URL to pypi + * Wed Aug 20 2014 Kashyap Chamarthy - 1.3.4 - Remove with_python3 conditional, as current Fedora releases have it 3) Add it to git: $ git add gerrymander.spec $ git status On branch f20 Your branch is up-to-date with 'origin/f20'. Changes to be committed: (use "git reset HEAD ..." to unstage) modified: .gitignore modified: gerrymander.spec modified: sources 4) Commit it: $ fedpkg commit [f20 9818f42] New upstream release: gerrymander 1.4 3 files changed, 11 insertions(+), 5 deletions(-) 5) Build SRPM: $ fedpkg srpm Wrote: /home/kashyap/fedora-packaging/gerrymander/master/gerrymander-1.4-1.fc22.src.rpm 6) Do a scratch build: $ fedpkg scratch-build --srpm gerrymander-1.4-1.fc22.src.rpm [====================================] 100% 00:00:01 42.26 KiB 35.39 KiB/sec Building gerrymander-1.4-1.fc22.src.rpm for rawhide Created task: 8569038 Task info: http://koji.fedoraproject.org/koji/taskinfo?taskID=8569038 Watching tasks (this may be safely interrupted)... 8569038 build (rawhide, gerrymander-1.4-1.fc22.src.rpm): open (buildvm-19.phx2.fedoraproject.org) 8569039 buildArch (gerrymander-1.4-1.fc22.src.rpm, noarch): open (buildvm-13.phx2.fedoraproject.org) 8569039 buildArch (gerrymander-1.4-1.fc22.src.rpm, noarch): open (buildvm-13.phx2.fedoraproject.org) -> closed 0 free 1 open 1 done 0 failed 8569038 build (rawhide, gerrymander-1.4-1.fc22.src.rpm): open (buildvm-19.phx2.fedoraproject.org) -> closed 0 free 0 open 2 done 0 failed 8569038 build (rawhide, gerrymander-1.4-1.fc22.src.rpm) completed successfully 7) Push it to Fedora git: $ fedpkg push Total 0 (delta 0), reused 0 (delta 0) remote: Emitting a message to the fedmsg bus. To ssh://kashyapc@pkgs.fedoraproject.org/gerrymander 8e72f5b..9818f42 master -> master 8) Build the RPM: $ fedpkg build Building gerrymander-1.4-1.fc22 for rawhide Created task: 8569135 Task info: http://koji.fedoraproject.org/koji/taskinfo?taskID=8569135 Watching tasks (this may be safely interrupted)... 8569135 build (rawhide, /gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607): free 8569135 build (rawhide, /gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607): free -> open (buildhw-03.phx2.fedoraproject.org) 8569200 buildSRPMFromSCM (/gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607): open (buildhw-03.phx2.fedoraproject.org) 8569200 buildSRPMFromSCM (/gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607): open (buildhw-03.phx2.fedoraproject.org) -> closed 0 free 1 open 1 done 0 failed 8569220 buildArch (gerrymander-1.4-1.fc22.src.rpm, noarch): open (buildhw-05.phx2.fedoraproject.org) 8569220 buildArch (gerrymander-1.4-1.fc22.src.rpm, noarch): open (buildhw-05.phx2.fedoraproject.org) -> closed 0 free 1 open 2 done 0 failed 8569361 tagBuild (noarch): open (arm02-builder16.arm.fedoraproject.org) 8569361 tagBuild (noarch): open (arm02-builder16.arm.fedoraproject.org) -> closed 0 free 1 open 3 done 0 failed 8569135 build (rawhide, /gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607): open (buildhw-03.phx2.fedoraproject.org) -> closed 0 free 0 open 4 done 0 failed 8569135 build (rawhide, /gerrymander:9818f4218282bfb5046d64a6c88b11b796b3c607) completed successfully Backporting changes to other supported Fedora releases ------------------------------------------------------ Change to the F21 branch: $ cd ../f21 $ git branch * f21 Upload the new sources: $ fedpkg new-sources ~/rpmbuild/SOURCES/gerrymander-1.4.tar.gz Uploading: 00bdbd453789c645efc1c9dbdd8df333 /home/kashyap/rpmbuild/SOURCES/gerrymander-1.4.tar.gz File already uploaded: gerrymander-1.4.tar.gz Uploaded and added to .gitignore: Source upload succeeded. Don't forget to commit the sources file Commit: $ fedpkg commit [f21 c5d5ea6] Upload 1.4 tarball from the official source (PyPI) 2 files changed, 2 insertions(+), 1 deletion(-) $ git merge origin/master $ fedpkg push $ fedpkg build $ fedpkg update