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)
(→Current approach) |
(→Packaging new upstream releases) |
||
| Line 17: | Line 17: | ||
# <code>cd SDL</code> | # <code>cd SDL</code> | ||
# Add nemo remote: <code>git remote add nemo git@github.com:nemomobile-packages/libsdl.git</code> | # Add nemo remote: <code>git remote add nemo git@github.com:nemomobile-packages/libsdl.git</code> | ||
| + | # <code>git fetch nemo</code> | ||
# Checkout the "nemo" branch: <code>git checkout nemo</code> | # Checkout the "nemo" branch: <code>git checkout nemo</code> | ||
# Merge a new upstream release: <code>git merge release-2.x.y</code> (potentially drop local patches merged upstream) | # Merge a new upstream release: <code>git merge release-2.x.y</code> (potentially drop local patches merged upstream) | ||
Revision as of 09:44, 21 April 2014
Packaging of SDL2 and related libraries. We use tar_git for packaging.
Contents |
Current approach
- Using
git-remote-hg(see git-remote-hg wiki) - Branch is
nemo - Token (
tar_git) is alsonemo - RPM package name, OBS package name in nemo:devel:mw: Git repository (upstream Hg repository):
- SDL2, libsdl2: https://github.com/nemomobile-packages/libsdl (upstream: https://hg.libsdl.org/SDL/)
- SDL2_image, libsdl2-image: https://github.com/nemomobile-packages/libsdl-image (upstream: https://hg.libsdl.org/SDL_image/)
- SDL2_mixer, libsdl2-mixer: https://github.com/nemomobile-packages/libsdl-mixer (upstream: https://hg.libsdl.org/SDL_mixer/)
- SDL2_ttf, libsdl2-ttf: https://github.com/nemomobile-packages/libsdl-ttf (upstream: https://hg.libsdl.org/SDL_ttf/)
Packaging new upstream releases
- Clone upstream:
git clone hg::https://hg.libsdl.org/SDL/ -
cd SDL - Add nemo remote:
git remote add nemo git@github.com:nemomobile-packages/libsdl.git -
git fetch nemo - Checkout the "nemo" branch:
git checkout nemo - Merge a new upstream release:
git merge release-2.x.y(potentially drop local patches merged upstream) - Update version in
rpm/*.spec, reset release to1 - Run a test build:
mb2 build - Commit spec file changes, message:
[nemo] New upstream release 2.x.y - Push changes:
git push nemo nemo - Tag as
nemo/VERSION-RELEASE(e.g.nemo/2.0.0-1) - Push tag:
git push nemo nemo/2.0.0-1
Packaging local changes / patches
- Clone nemo:
git clone git@github.com:nemomobile-packages/libsdl.git -
cd libsdl - Checkout the "nemo" branch:
git checkout nemo - Make changes
- Run a test build:
mb2 build - Increment release number in
rpm/*.spec - Commit with message
[nemo] DESCRIPTION OF CHANGES - Push changes:
git push nemo nemo - Tag as
nemo/VERSION-RELEASE(e.g.nemo/2.0.0-2) - Push tag:
git push nemo nemo/2.0.0-2
Previously
- Using hg-fast-export for importing from hg to git
- Branch is
rpm - Token is
nemo
