fix conflict

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 11 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cb366726496..0bc8b5fb40ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron18-bin
 	pkgdesc = Build cross platform desktop apps with web technologies - binary version 18
 	pkgver = 18.3.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://electronjs.org/
 	arch = x86_64
 	arch = i686
@@ -25,21 +25,20 @@ pkgbase = electron18-bin
 	provides = electron18=18.3.0
 	provides = electron=18.3.0
 	conflicts = electron18
-	conflicts = electron
-	source_x86_64 = electron18-bin-chromedriver-18.3.0-1-x86_64.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-x64.zip
-	source_x86_64 = electron18-bin-18.3.0-1-x86_64.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-x64.zip
+	source_x86_64 = electron18-bin-chromedriver-18.3.0-2-x86_64.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-x64.zip
+	source_x86_64 = electron18-bin-18.3.0-2-x86_64.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-x64.zip
 	sha256sums_x86_64 = c3050688acbc0678c2a2afee42755163220291063352d05152e332cbfcd80def
 	sha256sums_x86_64 = ff1af36b6bb75e92c1fd963d7c9447e2d5ed2c111ebec5d4ad29c15fd9fe160c
-	source_i686 = electron18-bin-chromedriver-18.3.0-1-i686.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-ia32.zip
-	source_i686 = electron18-bin-18.3.0-1-i686.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-ia32.zip
+	source_i686 = electron18-bin-chromedriver-18.3.0-2-i686.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-ia32.zip
+	source_i686 = electron18-bin-18.3.0-2-i686.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-ia32.zip
 	sha256sums_i686 = 6fe1c8448060f03854f344ca8308246bfd745d5f0ddcd7325be6c46992da1281
 	sha256sums_i686 = a7bbb6c01231d989926220463805d1ec4e63478cae0f5674ec06b501b1db6500
-	source_armv7h = electron18-bin-chromedriver-18.3.0-1-armv7h.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-armv7l.zip
-	source_armv7h = electron18-bin-18.3.0-1-armv7h.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-armv7l.zip
+	source_armv7h = electron18-bin-chromedriver-18.3.0-2-armv7h.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-armv7l.zip
+	source_armv7h = electron18-bin-18.3.0-2-armv7h.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-armv7l.zip
 	sha256sums_armv7h = cdb7f3eaa4291bd0720a86d94a6d3ec6b1056d90b5ead1cab720836c7922ad0d
 	sha256sums_armv7h = 9ac36dc5d8eba67e084241a92b2f910ef7c9b4885a012a9a84735713b724b033
-	source_aarch64 = electron18-bin-chromedriver-18.3.0-1-aarch64.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-arm64.zip
-	source_aarch64 = electron18-bin-18.3.0-1-aarch64.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-arm64.zip
+	source_aarch64 = electron18-bin-chromedriver-18.3.0-2-aarch64.zip::https://github.com/electron/electron/releases/download/v18.3.0/chromedriver-v18.3.0-linux-arm64.zip
+	source_aarch64 = electron18-bin-18.3.0-2-aarch64.zip::https://github.com/electron/electron/releases/download/v18.3.0/electron-v18.3.0-linux-arm64.zip
 	sha256sums_aarch64 = fac14cb340d851c0fe54b4365e0d643fe6ab7b7d021027e5a1ad8b2a15c64ef9
 	sha256sums_aarch64 = bc193b74f870599e62c8e869a99dc06ff4ad8b3380d2b98a6b9f1a4bdaf01dbb
 
diff --git a/PKGBUILD b/PKGBUILD
index 622aa12717c8..3f914ca5d6a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@ _pkgname="${_projectname}${_major}"
 pkgname="${_pkgname}"-bin
 _pkgver="${_major}.3.0"
 pkgver="${_pkgver/-/.}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Build cross platform desktop apps with web technologies - binary version ${_major}"
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url=https://electronjs.org/
 license=('MIT')
 provides=("${_pkgname}=${pkgver}" "${_projectname}=${pkgver}")
-conflicts=("${_pkgname}" "$_projectname")
+conflicts=("${_pkgname}")
 depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libxslt' 'minizip' 'nss' 're2'
          'snappy')
 optdepends=('kde-cli-tools: file deletion support (kioclient5)'