The Mer Wiki now uses your Mer user account and password (create account on https://bugs.merproject.org/)


Packaging/SDL

From Mer Wiki
(Difference between revisions)
Jump to: navigation, search
 
Line 8: Line 8:
 
* Cleanup / move away old branches (<code>rpm</code> and <code>master</code>)
 
* Cleanup / move away old branches (<code>rpm</code> and <code>master</code>)
 
* Remove master branch or make master branch point to default branch from hg
 
* Remove master branch or make master branch point to default branch from hg
* Integrate old changelog entries from before <code>git-remote-hg</code> approach
 
  
 
== Current approach ==
 
== Current approach ==
Line 15: Line 14:
 
* Branch is <code>nemo</code>
 
* Branch is <code>nemo</code>
 
* Token (<code>tar_git</code>) is also <code>nemo</code>
 
* Token (<code>tar_git</code>) is also <code>nemo</code>
 +
* Old ChangeLog (from pre-April 2014 developments) entries are imported via <code>rpm/*.changes</code>
 
* RPM package name, OBS package name in [https://build.merproject.org/project/packages?project=nemo:devel:mw nemo:devel:mw]: Git repository (upstream Hg repository):
 
* RPM package name, OBS package name in [https://build.merproject.org/project/packages?project=nemo:devel:mw nemo:devel:mw]: Git repository (upstream Hg repository):
 
** '''SDL2''', '''libsdl2''': https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/)
 
** '''SDL2''', '''libsdl2''': https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/)

Latest revision as of 11:57, 21 April 2014

Packaging of SDL2 and related libraries. We use tar_git for packaging and git-remote-hg for integrating the upstream Mercurial repository into our Git packaging repository.

Contents

[edit] TODO

  • Cleanup / move away old branches (rpm and master)
  • Remove master branch or make master branch point to default branch from hg

[edit] Current approach

[edit] Packaging new upstream releases

  1. Clone upstream: git clone hg::https://hg.libsdl.org/SDL/
  2. cd SDL
  3. Add nemo remote: git remote add nemo git@github.com:nemomobile-packages/libsdl.git
  4. git fetch nemo
  5. Checkout the "nemo" branch: git checkout nemo
  6. Merge a new upstream release: git merge release-2.x.y (potentially drop local patches merged upstream)
  7. Update version in rpm/*.spec, reset release to 1
  8. Run a test build: mb2 build
  9. Commit spec file changes, message: [nemo] New upstream release 2.x.y
  10. Push changes: git push nemo nemo
  11. Tag as nemo/VERSION-RELEASE (e.g. nemo/2.0.0-1)
  12. Push tag: git push nemo nemo/2.0.0-1

[edit] Packaging local changes / patches

  1. Clone nemo: git clone git@github.com:nemomobile-packages/libsdl.git
  2. cd libsdl
  3. Checkout the "nemo" branch: git checkout nemo
  4. Make changes
  5. Run a test build: mb2 build
  6. Increment release number in rpm/*.spec
  7. Commit with message [nemo] DESCRIPTION OF CHANGES
  8. Push changes: git push nemo nemo
  9. Tag as nemo/VERSION-RELEASE (e.g. nemo/2.0.0-2)
  10. Push tag: git push nemo nemo/2.0.0-2

[edit] Previously

  • Using hg-fast-export for importing from hg to git
  • Branch is rpm
  • Token is nemo
Personal tools