Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/makepkg.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-01-10 13:40:31 -0600
committerDan McGee <dan@archlinux.org>2011-01-21 19:30:45 -0600
commitbf46e04614b3740eea4a5e0d44767f57e1cffa4d (patch)
tree4a1fb5d578a539e42a1d73de1b3d83edbf17a58a /scripts/makepkg.sh.in
parent5c46ba14f780474e2b04b54aa7b0c8bf60de2b5b (diff)
Remove epoch as an independent field
Instead, go the same route we have always taken with version-release in libalpm and treat it all as one piece of information. Makepkg is the only script that knows about epoch as a distinct value; from there on out we will parse out the components as necessary. This makes the code a lot simpler as far as epoch handling goes. The downside here is that we are tossing some compatibility to the wind; packages using force will have to be rebuilt with an incremented epoch to keep their special status. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
-rw-r--r--scripts/makepkg.sh.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a2d9c837..c01ae0cb 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -935,9 +935,12 @@ write_pkginfo() {
echo "# $(LC_ALL=C date -u)"
echo "pkgname = $1"
(( SPLITPKG )) && echo pkgbase = $pkgbase
- echo "pkgver = $pkgver-$pkgrel"
+ if [[ $epoch ]]; then
+ echo "pkgver = $epoch:$pkgver-$pkgrel"
+ else
+ echo "pkgver = $pkgver-$pkgrel"
+ fi
echo "pkgdesc = $pkgdesc"
- [[ $epoch ]] && echo "epoch = $epoch"
echo "url = $url"
echo "builddate = $builddate"
echo "packager = $packager"