summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornot_anonymous2021-08-22 21:12:41 -0600
committernot_anonymous2021-08-22 21:12:41 -0600
commite3ebf4d7d43def9a7b49152bf92909211728a6dd (patch)
treedfed1c8aa339775610ee4593586181a036c1256f
parentd15ab1e224f9b7849c1a81d93a99710b94ede856 (diff)
downloadaur-e3ebf4d7d43def9a7b49152bf92909211728a6dd.tar.gz
Updated
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 6 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b0a80d7def88..3bca140092c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cqrlog-git
pkgdesc = An advanced ham radio logger using MariaDB - GIT version.
- pkgver = 2.0.4.r1.g7ffd237
+ pkgver = 2.5.2.r58.g5dd6ea9
pkgrel = 1
url = http://www.cqrlog.com
arch = i686
@@ -24,9 +24,9 @@ pkgbase = cqrlog-git
provides = cqrlog
conflicts = cqrlog
conflicts = cqrlog-source
+ conflicts = cqrlog-bin
source = cqrlog::git://github.com/ok2cqr/cqrlog.git#branch=master
md5sums = SKIP
sha256sums = SKIP
pkgname = cqrlog-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 5e96800b1c4f..14d5327a0221 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,18 +3,15 @@
pkgname=cqrlog-git
_pkgname=cqrlog
_authorname=ok2cqr
-pkgver=2.0.4.r1.g7ffd237
+pkgver=2.5.2.r58.g5dd6ea9
#.r1.g7ffd237
pkgrel=1
pkgdesc="An advanced ham radio logger using MariaDB - GIT version."
arch=('i686' 'x86_64')
url="http://www.cqrlog.com"
license=('GPL')
-depends=('xdg-utils'
- 'gtk2'
- 'mariadb')
-makedepends=('lazarus'
- 'git')
+depends=('xdg-utils' 'gtk2' 'mariadb')
+makedepends=('lazarus' 'git')
optdepends=('winkeydaemon: usb cw xmit'
'cwdaemon: transmitting cw'
'masterscp: supercheckpartial files'
@@ -26,12 +23,11 @@ optdepends=('winkeydaemon: usb cw xmit'
'xplanet: gui location'
'glabels: print qsl labels')
provides=('cqrlog')
-conflicts=('cqrlog' 'cqrlog-source')
+conflicts=('cqrlog' 'cqrlog-source' 'cqrlog-bin')
source=("${_pkgname}::git://github.com/${_authorname}/${_pkgname}.git#branch=master")
pkgver() {
cd "${_pkgname}"
- msg "Processing git version..."
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
@@ -39,7 +35,6 @@ pkgver() {
prepare() {
cd "$srcdir/$_pkgname"
- msg "Patching..."
sed -i 's/--ws=gtk2 --pcp=$(tmpdir)\/.lazarus src/--lazarusdir=\/usr\/lib\/lazarus --ws=gtk2 --pcp=$(tmpdir)\/.lazarus src/g' Makefile
sed -i "s:cqrlog.png:/usr/share/pixmaps/cqrlog/cqrlog.png:" tools/cqrlog.desktop
@@ -47,14 +42,12 @@ prepare() {
build() {
cd "$srcdir/$_pkgname"
- msg "Starting build..."
make
}
package() {
cd "$srcdir/$_pkgname"
- msg "Starting packaging..."
make DESTDIR="$pkgdir/" install
}