Upgrade to 1.5.2

4 files changed, 15 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9985659d83af..2badd2c64ec0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,15 @@
 pkgbase = ccalc
 	pkgdesc = Scientific calculator in which you can define new functions and constants
-	pkgver = 1.5.1
-	pkgrel = 1
+	pkgver = 1.5.2
+	pkgrel = 0
 	url = https://github.com/PhilippHochmann/ccalc
 	arch = x86_64
 	license = GPL3
+	makedepends = make
+	makedepends = gcc
 	depends = readline
-	source = ccalc-1.5.1.tar.gz
-	md5sums = 867a3280c9c296606a7eb7c016264c16
+	source = ccalc-1.5.2.tar.gz
+	md5sums = 765a182c42169f52b09b213cef55db50
 
 pkgname = ccalc
 
diff --git a/PKGBUILD b/PKGBUILD
index ff5b9829692b..94fff5d1753e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Philipp Hochmann <phil.hochmann[ät]gmail[dot]com>
 pkgname=ccalc
-pkgver=1.5.1
-pkgrel=1
+pkgver=1.5.2
+pkgrel=0
 epoch=
 pkgdesc="Scientific calculator in which you can define new functions and constants"
 arch=('x86_64')
@@ -9,7 +9,7 @@ url="https://github.com/PhilippHochmann/ccalc"
 license=('GPL3')
 groups=()
 depends=('readline')
-makedepends=()
+makedepends=('make' 'gcc')
 checkdepends=()
 optdepends=()
 provides=()
@@ -21,7 +21,7 @@ install=
 changelog=
 source=("$pkgname-$pkgver.tar.gz")
 noextract=()
-md5sums=('867a3280c9c296606a7eb7c016264c16')
+md5sums=('765a182c42169f52b09b213cef55db50')
 validpgpkeys=()
 
 prepare() {
@@ -29,23 +29,12 @@ prepare() {
 }
 
 build() {
-	# - - - - - - - Build configuration - - - - - - -
-	use_readline=true
-	# - - - - - - - - - - - - - - - - - - - - - - - -
-
-	LFLAGS="-lm"
-	DEFINES=""
-	CFLAGS="-std=c99 -Wall -Wextra -Werror -pedantic"
-	FILES="src/*/*.c src/*.c"
-	BIN="ccalc"
-
-	if [ "$use_readline" = true ]; then
-		LFLAGS="$LFLAGS -lreadline"
-		DEFINES="$DEFINES -DUSE_READLINE"
-	fi
-
 	cd "$pkgname-$pkgver"
-	gcc $DEFINES -O3 $CFLAGS $FILES -o $BIN $LFLAGS
+	make
+	if [ $? -eq 0 ]; then
+		mv bin/release/ccalc .
+		make clean
+	fi
 }
 
 check() {
diff --git a/ccalc-1.5.1.tar.gz b/ccalc-1.5.1.tar.gz
deleted file mode 100644
index 8376265890a3..000000000000
--- a/ccalc-1.5.1.tar.gz
+++ /dev/null
diff --git a/ccalc-1.5.2.tar.gz b/ccalc-1.5.2.tar.gz
new file mode 100644
index 000000000000..07cebb685366
--- /dev/null
+++ b/ccalc-1.5.2.tar.gz