1RDOPKG-ADV-NEW-VE(7) RDOPKG-ADV-NEW-VE(7)
2
6 rdopkg-adv-new-version - rdopkg adventures: new-version
7
9 This is a short story about updating RDO python-swiftclient package to
10 new upstream version using rdopkg new-version.
11 Let’s assume update of Havana epel-6 python-swiftclient-1.8.0-1 package
13 to latest upstream version 2.0.2.
14
16 dist-git & remotes
17 $ cd python-swiftclient
19 $ git fetch --all
20 $ git remote -v
21 openstack git://github.com/openstack/python-swiftclient.git (fetch)
22 openstack git://github.com/openstack/python-swiftclient.git (push)
23 origin ssh://jruzicka@pkgs.fedoraproject.org/python-swiftclient (fetch)
24 origin ssh://jruzicka@pkgs.fedoraproject.org/python-swiftclient (push)
25 patches git@github.com:redhat-openstack/python-swiftclient.git (fetch)
26 patches git@github.com:redhat-openstack/python-swiftclient.git (push)
27 To summarise, above remotes are:
29 · origin: Fedora dist-git containing .spec & patches
31 (obtained by fedpkg clone python-swiftclient)
33 · patches: github remote with RDO patches branches
35 · openstack: upstream code repo to cherry-pick backported patch from
37 This is a Havana epel-6 fix, so I’m gonna work with:
39 · origin/el6-havana dist-git
41 · patches/stable/havana patches branch
43 See rdopkg info output for current branch names.
45 Before we proceed, let’s inspect the patches branch:
47 o [patches/stable/havana] Add SSL certificate verification by default
49 o Remove builtin requirements handling
50 M─┐ [1.8.0] Merge "Make pbr only a build-time dependency."
51 │ o Make pbr only a build-time dependency.
52 o │ assertEquals is deprecated, use assertEqual (H602
53 ...
54 You can see that there are two commits on top of 1.8.0. These two
56 patches are present in dist-git and applied in .spec file:
57 ...
59 Patch0001: 0001-Remove-builtin-requirements-handling.patch
60 Patch0002: 0002-Add-SSL-certificate-verification-by-default.patch
61 ...
62 %patch0001 -p1
63 %patch0002 -p1
64 ...
65
67 rdopkg new-version
68 With remotes set up and up to date, it’s time to run rdopkg
70 new-version.
71 The only required positional argument specifies a version to update to.
73 This is 2.0.2 in this case and it’s both new rpm Version and git tag to
74 rebase patches branch on. For other packages and versions, version tag
75 and rpm Version might differ.
76 $ git fetch --all
78 $ git checkout el6-havana
79 $ rdopkg new-version 2.0.2
80
82 diff
83 First, rdopkg displays summary of changed files and changes to
85 requirements.txt files:
86 --- a/requirements.txt
88 +++ b/requirements.txt
89 @@ -1 +1,2 @@
90 +requests>=1.1
91 simplejson>=2.0.9
92 I make a mental note I need to add Requires: python-requests later and
94 press enter to advance.
95
97 rebase of patches branch
98 Next, rdopkg resets the local stable/havana branch to
100 patches/stable/havana, switches to it, and tries to rebase it on 2.0.2
101 git tag.
102 The rebase failed due to a conflict of downstream patches nuking pbr
104 and rdopkg exited to shell so I can finish the rebase manually.
105 I modified the conflicting patch and continued the rebase with
107 git rebase --continue
109 Then the second patch failed to apply as well. This was a downstream
111 only fix and upstream has chosen a different solution which is already
112 included in 2.0.2 and thus I skipped this patch entirely with
113 git rebase --skip
115 Now, the patches branch look like this:
117 o [stable/havana] Remove builtin requirements handling
119 o [2.0.2] Remove multipart/form-data file upload
120 o Fix --insecure option on auth
121 M─┐ Merge "Port to python-requests"
122 First patch is on top of 2.0.2, second obsolete patch is gone.
124
126 the rest is magic
127 Once I’m happy with the rebased patches branch, I resume rdopkg action
129 with
130 rdopkg -c
132 Now, rdopkg asks if I want to push the shiny rebased patches branch. I
134 indeed do. Note that you need to have force push permission in the
135 patches remote.
136 Push stable/havana to patches / stable/havana (with --force)? [Yn]
138 After this, rdopkg:
140 · downloads the source tarball
142 · calls fedpkg new-sources
144 · updates .spec file (Version, Release, patches_base, new changelog
146 entry)
147 · creates new commit with updated .spec
149 · updates patches from local patches branch stable/havana
151 · shows final diff
153 pseudo-diff of .spec file:
155 -Version: 1.8.0
157 +Version: 2.0.2
158 ...
159 -# patches_base=1.8.0
160 +# patches_base=2.0.2
161 ...
162 Patch0001: 0001-Remove-builtin-requirements-handling.patch
163 -Patch0002: 0002-Add-SSL-certificate-verification-by-default.patch
164 ...
165 %patch0001 -p1
166 -%patch0002 -p1
167 ...
168 +* Thu Feb 20 2014 Jakub Ruzicka <jruzicka@redhat.com> 2.0.2-1
169 +- Update to upstream 2.0.2
170 +
171 ...
172 As you can see, obsolete patch I deleted during rebase is gone.
174 Commit message and changed files:
176 Update to upstream 2.0.2
178 M .gitignore
180 M 0001-Remove-builtin-requirements-handling.patch
181 D 0002-Add-SSL-certificate-verification-by-default.patch
182 M python-swiftclient.spec
183 M sources
184
186 finishing touches & rdopkg amend
187 Finally, I need to tune .spec file due to new deps and amend with
189 rdopkg amend to regenerate commit message from %changelog:
190 vim python-swiftclient.spec
192 rdopkg amend
193 Final commit message:
195 Update to upstream 2.0.2
197 Changelog:
199 - Update to upstream 2.0.2
200 - Switch from pyOpenSSL to python-requests - update dependencies
201 - Remove unneeded dependency: python-simplejson
202
204 See available options
205 rdopkg new-version -h
207 and rdopkg(1) manual for more information.
209 04/08/2019 RDOPKG-ADV-NEW-VE(7)