upgpkg: rhvoice-git 1.2.3.r37.2dc35bc-1

* improve PKGBUILD
* use compile flags

2 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0584c01a3fac..b2dab92cbd52 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = rhvoice-git
 	pkgdesc = Free and open source speech synthesizer for Russian and other languages. (development version)
-	pkgver = 1.0.0.r4.d96020c
+	pkgver = 1.2.3.r37.2dc35bc
 	pkgrel = 1
 	url = https://github.com/Olga-Yakovleva/RHVoice
 	arch = x86_64
 	license = GPL3
 	makedepends = git
 	makedepends = scons
-	makedepends = python-lxml
 	depends = libpulse
 	optdepends = rhvoice-dictionary-git: extended russian dictionary
 	optdepends = speech-dispatcher: for speech-dispatcher module support
@@ -16,7 +15,7 @@ pkgbase = rhvoice-git
 	provides = rhvoice
 	conflicts = rhvoice
 	backup = etc/RHVoice/RHVoice.conf
-	source = git+https://github.com/Olga-Yakovleva/RHVoice.git
+	source = rhvoice::git+https://github.com/Olga-Yakovleva/RHVoice.git
 	md5sums = SKIP
 
 pkgname = rhvoice-git
diff --git a/PKGBUILD b/PKGBUILD
index 543379d1a2fc..423b9faff7ba 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,41 @@
-# Maintainer: alex19EP <aarnaarn2@gmail.com>
+# Maintainer: Alexander Epaneshnikov <aarnaarn2@gmail.com>
 # Maintainer: vantu5z <vantu5z@mail.ru>
 # Contributor: der_fenix <derfenix@gmail.com>
 
 pkgname=rhvoice-git
-pkgver=1.0.0.r4.d96020c
+pkgver=1.2.3.r37.2dc35bc
 pkgrel=1
 pkgdesc="Free and open source speech synthesizer for Russian and other languages. (development version)"
 arch=('x86_64')
 url="https://github.com/Olga-Yakovleva/RHVoice"
 license=('GPL3')
 depends=('libpulse')
-makedepends=('git' 'scons' 'python-lxml')
+makedepends=('git' 'scons')
 optdepends=('rhvoice-dictionary-git: extended russian dictionary'
 	'speech-dispatcher: for speech-dispatcher module support'
 	'portaudio: for portaudio backend'
 	'libao: for ao backend')
-provides=('rhvoice')
-conflicts=('rhvoice')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
 backup=('etc/RHVoice/RHVoice.conf')
-source=('git+https://github.com/Olga-Yakovleva/RHVoice.git')
+source=(${pkgname%-git}::'git+https://github.com/Olga-Yakovleva/RHVoice.git')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/RHVoice"
+	cd "$srcdir/${pkgname%-git}"
 	printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {
-	cd "$srcdir/RHVoice"
-	scons prefix="/usr" sysconfdir="/etc"
+	cd "$srcdir/${pkgname%-git}"
+	scons prefix="/usr" sysconfdir="/etc" CPPFLAGS="$CPPFLAGS" CCFLAGS="$CFLAGS" \
+	      LINKFLAGS="$LDFLAGS"
 }
 
 package() {
-	cd "$srcdir/RHVoice"
+	cd "$srcdir/${pkgname%-git}"
 	mkdir -p "${pkgdir}/usr/lib/speech-dispatcher-modules"
-	scons install DESTDIR="${pkgdir}" prefix="/usr" sysconfdir="/etc"
+	scons install DESTDIR="${pkgdir}" prefix="/usr" sysconfdir="/etc" \
+	      CPPFLAGS="$CPPFLAGS" CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS"
 	ln -s "/usr/bin/sd_rhvoice" "${pkgdir}/usr/lib/speech-dispatcher-modules/sd_rhvoice"
 }