update to 7.1 using CentOS rpm

2 files changed, 26 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9935da853961..08b193e5dee1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
+# Generated by mksrcinfo v8
+# Wed Sep 13 03:06:42 UTC 2017
 pkgbase = bouml
-	pkgdesc = A free UML 2 tool box allowing you to specify and generate code in C++, Java, Idl, Php and Python.
-	pkgver = 6.11.3
+	pkgdesc = A free UML 2 tool box including a modeler allowing you to specify and generate code in C++, Java, IDL, PHP, Python and MySQL
+	pkgver = 7.1
 	pkgrel = 1
 	url = http://bouml.fr/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = qt4
-	options = !strip
-	source_i686 = v6.11.3-32.tar.gz::https://github.com/funilrys/archlinux-bouml-src/archive/v6.11.3-32.tar.gz
-	sha512sums_i686 = d90a57e02fab8e25b77b3f75b95f70846f482731108e384f45ec4cf6e93cdcc526afdf1297c37dec70900cad57b578a6ed6ec9ebde0cb5ce11e7eb52baca3060
-	source_x86_64 = v6.11.3-64.tar.gz::https://github.com/funilrys/archlinux-bouml-src/archive/v6.11.3-64.tar.gz
-	sha512sums_x86_64 = e4e66d7c472cbc037514cfaa189cf6909317a5ddc02d8c2899a6b1465925abe44a0225e6bf97f2e5b8a09bf35433b9281ed5208767e7648ddef1921cf5fd4dc8
+	source_i686 = v7.1-32.tar.gz::http://www.bouml.fr/files/bouml-7.1-CentOS6.i686.rpm
+	sha512sums_i686 = 6f3d018808fce3a6690c8e8a8a6bb2bc8b3bfc599d6acffdbc656bc391abd6a1761df0b60ded85224e0ae88a71982165afe88b6d7140173c922672d30218a9e3
+	source_x86_64 = v7.1-64.tar.gz::http://www.bouml.fr/files/bouml-7.1-CentOS7.x86_64.rpm
+	sha512sums_x86_64 = 5643dbe95a1c0a0b768751d8d0c757c2f83518c963777d9c8b9bde79d96ee5228d7c489f5332d1f7f3e4614213b3adc8b50df58646325757038b5b1979d33d9b
 
 pkgname = bouml
 
diff --git a/PKGBUILD b/PKGBUILD
index dbc5e515ba5a..7be16fbf9cf3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,36 @@
-#! /bin/bash
-# Maintainer: Nissar Chababy <funilrys at outlook dot com>
-# Ex-Maintainer: Jorge Barroso <jorge.barroso.11 at gmail dot com>
+#!/bin/bash
+# Maintainer: Nathaniel Stickney <nstickney@gmail.com>
+# Contributor: Nissar Chababy <funilrys@outlook.com>
+# Contributor: Jorge Barroso <jorge.barroso.11@gmail.com>
 # Contributor: cros_145<joner14@hotmail.com>
+# shellcheck disable=SC2034,SC2154
 
 pkgname=bouml
-pkgver=6.11.3
+pkgver=7.1
 pkgrel=1
-pkgdesc='A free UML 2 tool box allowing you to specify and generate code in C++, Java, Idl, Php and Python. '
+pkgdesc='A free UML 2 tool box including a modeler allowing you to specify and generate code in C++, Java, IDL, PHP, Python and MySQL'
 arch=('i686' 'x86_64')
-options=('!strip')
+# options=('!strip')
 url='http://bouml.fr/'
 license=('GPL')
 depends=('qt4')
 # makedepends=('rpmextract')
-source_x86_64=("v${pkgver}-64.tar.gz::https://github.com/funilrys/archlinux-bouml-src/archive/v$pkgver-64.tar.gz")
-source_i686=("v${pkgver}-32.tar.gz::https://github.com/funilrys/archlinux-bouml-src/archive/v$pkgver-32.tar.gz")
-sha512sums_x86_64=('e4e66d7c472cbc037514cfaa189cf6909317a5ddc02d8c2899a6b1465925abe44a0225e6bf97f2e5b8a09bf35433b9281ed5208767e7648ddef1921cf5fd4dc8')
-sha512sums_i686=('d90a57e02fab8e25b77b3f75b95f70846f482731108e384f45ec4cf6e93cdcc526afdf1297c37dec70900cad57b578a6ed6ec9ebde0cb5ce11e7eb52baca3060')
+source_x86_64=("v${pkgver}-64.tar.gz::http://www.bouml.fr/files/$pkgname-$pkgver-CentOS7.x86_64.rpm")
+source_i686=("v${pkgver}-32.tar.gz::http://www.bouml.fr/files/$pkgname-$pkgver-CentOS6.i686.rpm")
+sha512sums_x86_64=('5643dbe95a1c0a0b768751d8d0c757c2f83518c963777d9c8b9bde79d96ee5228d7c489f5332d1f7f3e4614213b3adc8b50df58646325757038b5b1979d33d9b')
+sha512sums_i686=('6f3d018808fce3a6690c8e8a8a6bb2bc8b3bfc599d6acffdbc656bc391abd6a1761df0b60ded85224e0ae88a71982165afe88b6d7140173c922672d30218a9e3')
 
 package() {
     mkdir -p $pkgdir/usr/bin/
     mkdir -p $pkgdir/usr/share/applications/
     mkdir -p $pkgdir/usr/share/icons
+    cp -R $srcdir/usr/bin/* $pkgdir/usr/bin/
+    cp -R $srcdir/usr/share/applications/* $pkgdir/usr/share/applications/
+    cp -R $srcdir/usr/share/icons/* $pkgdir/usr/share/icons/
+    mkdir -p $pkgdir/usr/lib/bouml
     if [ "$CARCH" = "x86_64" ]; then
-        mkdir -p $pkgdir/usr/lib64
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-64/usr/bin/* $pkgdir/usr/bin/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-64/usr/share/applications/* $pkgdir/usr/share/applications/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-64/usr/share/icons/* $pkgdir/usr/share/icons/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-64/usr/lib64/* $pkgdir/usr/lib64/
+        cp -R $srcdir/usr/lib64/bouml/* $pkgdir/usr/lib/bouml/
     else
-        mkdir -p $pkgdir/usr/lib
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-32/usr/bin/* $pkgdir/usr/bin/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-32/usr/share/applications/* $pkgdir/usr/share/applications/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-32/usr/share/icons/* $pkgdir/usr/share/icons/
-        cp -R $srcdir/archlinux-bouml-src-$pkgver-32/usr/lib/* $pkgdir/usr/lib/
+        cp -R $srcdir/usr/lib/bouml/* $pkgdir/usr/lib/bouml/
     fi
 }