diff options
| author | Adrià Arrufat | 2016-03-18 23:23:19 +0100 |
|---|---|---|
| committer | Adrià Arrufat | 2016-03-18 23:23:19 +0100 |
| commit | e1983f1ee8766a6f87fe9ab14000a273046b5fb8 (patch) | |
| tree | 60f580829334d94c8d88b1af76f7015ae5beed28 | |
| parent | b44032b058cfede44cb19c8569f47079d91c8538 (diff) | |
| download | aur-e1983f1ee8766a6f87fe9ab14000a273046b5fb8.tar.gz | |
Make package version guidelines compliant
Also make regex work when not building from scratch
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
2 files changed, 10 insertions, 7 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Mar 16 18:56:49 UTC 2016 +# Fri Mar 18 22:22:49 UTC 2016 pkgbase = rhythmbox-git pkgdesc = Music playback and management application - pkgver = 3.3.0.28.ga61f8a4 + pkgver = 3.3.0.r31.g11c6fd7 pkgrel = 1 url = http://www.rhythmbox.org install = rhythmbox.install @@ -43,7 +43,7 @@ pkgbase = rhythmbox-git optdepends = libgpod: Portable Players - iPod plugin optdepends = libmtp: Portable Players - MTP plugin optdepends = python-mako: Context pane plugin - provides = rhythmbox=3.3.0.28.ga61f8a4 + provides = rhythmbox=3.3.0.r31.g11c6fd7 conflicts = rhythmbox options = !emptydirs source = rhythmbox-git::git+https://git.gnome.org/browse/rhythmbox @@ -6,7 +6,7 @@ _pkgname=rhythmbox pkgname=$_pkgname-git -pkgver=3.3.0.28.ga61f8a4 +pkgver=3.3.0.r31.g11c6fd7 pkgrel=1 pkgdesc="Music playback and management application" arch=(i686 x86_64) @@ -37,21 +37,24 @@ pkgver() { dots=`git describe | grep -o '\.' | wc -l` if [ ${dots} -eq 1 ] then - git describe | sed 's/^v//;s/-/.0./;s/-/./g' + git describe | sed 's/^v//;s/\([^-]*-g\)/0.r\1/;s/-/./g' else - git describe | sed 's/^v//;s/-/./g' + git describe | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' fi } prepare() { cd $pkgname/ dots=`git describe | grep -o '\.' | wc -l` + # reset to the original version so that regex works + git checkout configure.ac # use a different regex depending on the version if [ ${dots} -eq 1 ] then sed "{:q;N;s/(\[rhythmbox\],\n\t\[\([0-9]\).\([0-9]\)\],/(\[rhythmbox\],\n\t[$pkgver],/g;t q}" -i configure.ac + else + sed "{:q;N;s/(\[rhythmbox\],\n\t\[\([0-9]\).\([0-9]\).\([0-9]\)\],/(\[rhythmbox\],\n\t[$pkgver],/g;t q}" -i configure.ac fi - sed "{:q;N;s/(\[rhythmbox\],\n\t\[\([0-9]\).\([0-9]\).\([0-9]\)\],/(\[rhythmbox\],\n\t[$pkgver],/g;t q}" -i configure.ac } build() { |