Correction on conflicts array

2 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f98daadc96c..a6290b029692 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,3 +16,21 @@ pkgbase = stm32flash
 
 pkgname = stm32flash
 
+pkgbase = stm32flash
+	pkgdesc = Open source flash program for the STM32 ARM processors using the ST serial bootloader over UART or I2C
+	pkgver = 0.5
+	pkgrel = 2
+	url = https://sourceforge.net/projects/stm32flash/
+	arch = i686
+	arch = x86_64
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	license = GPL2
+	provides = stm32flash
+	conflicts = stm32flash-git
+	source = http://downloads.sourceforge.net/project/stm32flash/stm32flash-0.5.tar.gz
+	sha512sums = a01875a315d92d5e347372b736f2afa2f633851bf13af1326341c0c91e17cef54b6730ed1279280e86d3797033c856dfc25e8c595e010772b9287aaf965273f9
+
+pkgname = stm32flash
+
diff --git a/PKGBUILD b/PKGBUILD
index 45976ccf7daf..b919601431f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
-# Maintainer: Andrey Tkachenko <andreytkachenko64@gmail.com>
+# Maintainer: Andrea Girotto <andrea.girotto@gmail.com>
 
 pkgname=stm32flash
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source flash program for the STM32 ARM processors using the ST serial bootloader over UART or I2C'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
-url='https://sourceforge.net/projects/stm32flash/?source=navbar'
+url='https://sourceforge.net/projects/stm32flash/'
 license=('GPL2')
 makedepends=()
 provides=("$pkgname")
-conflicts=("$pkgname")
+conflicts=("$pkgname-git")
 source=(http://downloads.sourceforge.net/project/stm32flash/$pkgname-$pkgver.tar.gz)
 sha512sums=('a01875a315d92d5e347372b736f2afa2f633851bf13af1326341c0c91e17cef54b6730ed1279280e86d3797033c856dfc25e8c595e010772b9287aaf965273f9')