New package: osmo-trx-git -> osmo-trx v1.6.1

2 files changed, 14 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index deb5123dccf5..bc6d65eb5efc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = osmo-trx-git
+pkgbase = osmo-trx
 	pkgdesc = GSM Radio Modem based on a fork of the OpenBTS Transceiver program
-	pkgver = 1.6.0.r9.ga118d98e
+	pkgver = 1.6.1
 	pkgrel = 1
 	url = https://osmocom.org/projects/osmotrx
 	arch = i686
@@ -8,7 +8,6 @@ pkgbase = osmo-trx-git
 	arch = aarch64
 	arch = armv7h
 	license = GPL
-	makedepends = git
 	makedepends = boost
 	depends = libosmocore
 	depends = libusb
@@ -16,11 +15,11 @@ pkgbase = osmo-trx-git
 	depends = limesuite
 	depends = talloc
 	depends = fftw
-	conflicts = osmo-trx
+	conflicts = osmo-trx-git
 	backup = etc/osmocom/osmo-trx-uhd.cfg
 	backup = etc/osmocom/osmo-trx-lms.cfg
 	backup = etc/osmocom/osmo-trx-ipc.cfg
-	source = git+https://gitea.osmocom.org/cellular-infrastructure/osmo-trx.git
-	sha256sums = SKIP
+	source = https://downloads.osmocom.org/releases/osmo-trx/osmo-trx-1.6.1.tar.bz2
+	sha256sums = a5ac6a301c2225d75fade2611c5fa4621a8c79324034151569c219c6b3e0dacd
 
-pkgname = osmo-trx-git
+pkgname = osmo-trx
diff --git a/PKGBUILD b/PKGBUILD
index dfde1eceada8..e033783e80c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Vadim Yanitskiy <fixeria@osmocom.org>
 # Contributor: Josef Miegl <josef@miegl.cz>
 
-pkgname=osmo-trx-git
-pkgver=1.6.0.r9.ga118d98e
+pkgname=osmo-trx
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="GSM Radio Modem based on a fork of the OpenBTS Transceiver program"
 url="https://osmocom.org/projects/osmotrx"
@@ -14,26 +14,16 @@ depends=('libosmocore'
          'limesuite' # --with-lms
          'talloc'
          'fftw')
-makedepends=('git' 'boost')
-conflicts=("${pkgname%-git}")
+makedepends=('boost')
+conflicts=("${pkgname}-git")
 backup=('etc/osmocom/osmo-trx-uhd.cfg'
         'etc/osmocom/osmo-trx-lms.cfg'
         'etc/osmocom/osmo-trx-ipc.cfg')
-source=("git+https://gitea.osmocom.org/cellular-infrastructure/${pkgname%-git}.git")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "${pkgname%-git}"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd "${pkgname%-git}"
-  autoreconf -f -i
-}
+source=("https://downloads.osmocom.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha256sums=('a5ac6a301c2225d75fade2611c5fa4621a8c79324034151569c219c6b3e0dacd')
 
 build() {
-  cd "${pkgname%-git}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
@@ -46,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${pkgname%-git}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR=${pkgdir} install
 }