summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse2022-03-15 20:52:58 +0100
committerChristian Hesse2022-03-15 20:52:58 +0100
commit3f8a0070b13038423a76dd96e615590c432e327e (patch)
tree8966405c1e7723eb29f4e7080876959509de3b3d
parent77398958fd49352284df7d0fceee7125d77a182b (diff)
downloadaur-cqrlogo-git.tar.gz
commit cqrlogo-git 0.5.5.r1.gb2bc264-1
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD27
2 files changed, 19 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2297c509049e..130db0e0bb60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cqrlogo-git
pkgdesc = CGI QR-Code logo for web services - git checkout
- pkgver = 0.5.3.r0.g485ef31
+ pkgver = 0.5.5.r1.gb2bc264
pkgrel = 1
url = https://github.com/eworm-de/cqrlogo
install = cqrlogo.install
@@ -11,7 +11,7 @@ pkgbase = cqrlogo-git
checkdepends = pngcheck
makedepends = fcgi
makedepends = git
- makedepends = markdown
+ makedepends = discount
depends = iniparser
depends = libpng
depends = qrencode
@@ -25,8 +25,7 @@ pkgbase = cqrlogo-git
backup = etc/cqrlogo.conf
backup = etc/httpd/conf/extra/cqrlogo.conf
backup = etc/lighttpd/conf.d/cqrlogo.conf
- source = git://github.com/eworm-de/cqrlogo.git
+ source = git+https://github.com/eworm-de/cqrlogo.git
sha256sums = SKIP
pkgname = cqrlogo-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cb336be25558..783f279d0740 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Christian Hesse <mail@eworm.de>
pkgname=cqrlogo-git
-pkgver=0.5.3.r0.g485ef31
+pkgver=0.5.5.r1.gb2bc264
pkgrel=1
-pkgdesc="CGI QR-Code logo for web services - git checkout"
+pkgdesc='CGI QR-Code logo for web services - git checkout'
arch=('i686' 'x86_64')
-url="https://github.com/eworm-de/cqrlogo"
+url='https://github.com/eworm-de/cqrlogo'
depends=('iniparser' 'libpng' 'qrencode')
-makedepends=('fcgi' 'git' 'markdown')
+makedepends=('fcgi' 'git' 'discount')
optdepends=('apache: for apache web server inclusion'
- 'fcgi: for FastCGI version'
- 'lighttpd: for lighttpd web server inclusion'
- 'mod_fastcgi: for fastcgi in apache web server'
- 'mod_fcgid: for fastcgi in apache web server')
+ 'fcgi: for FastCGI version'
+ 'lighttpd: for lighttpd web server inclusion'
+ 'mod_fastcgi: for fastcgi in apache web server'
+ 'mod_fcgid: for fastcgi in apache web server')
conflicts=('cqrlogo')
provides=('cqrlogo')
checkdepends=('zbar' 'pngcheck')
@@ -21,16 +21,21 @@ install=cqrlogo.install
backup=('etc/cqrlogo.conf'
'etc/httpd/conf/extra/cqrlogo.conf'
'etc/lighttpd/conf.d/cqrlogo.conf')
-source=('git://github.com/eworm-de/cqrlogo.git')
+source=('git+https://github.com/eworm-de/cqrlogo.git')
sha256sums=('SKIP')
pkgver() {
cd cqrlogo/
if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
- echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+ printf '%s.r%s.g%s' \
+ "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+ "$(git rev-list --count ${GITTAG}..)" \
+ "$(git rev-parse --short HEAD)"
else
- echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+ printf '0.r%s.g%s' \
+ "$(git rev-list --count master)" \
+ "$(git rev-parse --short HEAD)"
fi
}