Upstream update: release 2.1

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 468b49a035b0..c438a4a2bb4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = phototonic
 	pkgdesc = Image Viewer and Organizer
-	pkgver = 1.7.13
-	pkgrel = 2
+	pkgver = 2.1
+	pkgrel = 1
 	url = https://github.com/oferkv/phototonic/
 	arch = i686
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = phototonic
 	depends = hicolor-icon-theme
 	optdepends = qt5-imageformats: TIFF and TGA support
 	optdepends = qt5-svg: SVG support
-	source = phototonic-1.7.13.tar.gz::https://github.com/oferkv/phototonic/archive/c1998178dfc49275c716250914ee1aac910ab908.tar.gz
-	sha256sums = 28994936d559c8ffd92da661460c7b7e404455ef88293fcfc1d7de0640612852
+	source = phototonic-2.1.tar.gz::https://github.com/oferkv/phototonic/archive/v2.1.tar.gz
+	sha256sums = a8b2dbc81750efabb65a4732b1704641afd4a4f772ef9c90817871ca2a52f5ef
 
 pkgname = phototonic
 
diff --git a/PKGBUILD b/PKGBUILD
index 2675b7adbbb9..a1bdd8ca1aba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,30 +3,29 @@
 # Contributor: Ofer Kashayov <oferkv at gmail dot com>
 
 pkgname=phototonic
-pkgver=1.7.13
-pkgrel=2
-_commit=c1998178dfc49275c716250914ee1aac910ab908
+pkgver=2.1
+pkgrel=1
 pkgdesc='Image Viewer and Organizer'
 arch=('i686' 'x86_64')
 url='https://github.com/oferkv/phototonic/'
 license=('GPL3')
 depends=('qt5-base' 'exiv2' 'hicolor-icon-theme')
 optdepends=('qt5-imageformats: TIFF and TGA support' 'qt5-svg: SVG support')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/oferkv/phototonic/archive/$_commit.tar.gz")
-sha256sums=('28994936d559c8ffd92da661460c7b7e404455ef88293fcfc1d7de0640612852')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/oferkv/phototonic/archive/v${pkgver}.tar.gz")
+sha256sums=('a8b2dbc81750efabb65a4732b1704641afd4a4f772ef9c90817871ca2a52f5ef')
 
 build() {
-  cd $pkgname-$_commit
-
-  qmake-qt5 PREFIX="/usr" \
-    QMAKE_CFLAGS_RELEASE="$CPPFLAGS $CFLAGS" \
-    QMAKE_CXXFLAGS_RELEASE="$CPPFLAGS $CXXFLAGS" \
-    QMAKE_LFLAGS_RELEASE="$LDFLAGS"
+  rm -Rf build && mkdir build
+  cd build
+  qmake-qt5 ${srcdir}/${pkgname}-${pkgver} \
+            PREFIX="/usr" \
+            QMAKE_CFLAGS_RELEASE="${CPPFLAGS} ${CFLAGS}" \
+            QMAKE_CXXFLAGS_RELEASE="${CPPFLAGS} ${CXXFLAGS}" \
+            QMAKE_LFLAGS_RELEASE="${LDFLAGS}"
   make
 }
 
 package() {
-  cd $pkgname-$_commit
-
-  make INSTALL_ROOT="$pkgdir" install
+  cd build
+  make INSTALL_ROOT="${pkgdir}" install
 }