summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Goulet-Lipman2021-05-03 09:05:13 -0400
committerJason Goulet-Lipman2021-05-03 09:05:13 -0400
commit347e2006259305cb8b95db67e71b2978af411363 (patch)
tree55993a1fa5b03aae24db6be2c9642c4747ce256b
parenta54c7bc4609fc7063ede2d2071c5ccf38e76d2c6 (diff)
downloadaur-347e2006259305cb8b95db67e71b2978af411363.tar.gz
fixed conflict
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 74e08e7f2ecc..836b99ade7db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = youtubedl-gui
pkgdesc = Download Youtube videos to local audio or video files.
pkgver = 2.5
- pkgrel = 1
+ pkgrel = 2
arch = x86_64
license = GPL3
makedepends = qt5-quickcontrols
@@ -10,7 +10,8 @@ pkgbase = youtubedl-gui
depends = qt5-base
depends = ffmpeg
depends = hicolor-icon-theme
- conflicts = youtubedl-gui-beta
+ provides = youtubedl-gui
+ conflicts = youtubedl-gui
source = https://github.com/JaGoLi/ytdl-gui/archive/2.5.tar.gz
sha256sums = d725f94061819f9366e6a170e9cebd06dd6bf824d180a13976f7b1f9bd8e5754
diff --git a/PKGBUILD b/PKGBUILD
index ec5dc171180a..3777c48e62ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
pkgname=youtubedl-gui
_pkgname=ytdl-gui
pkgver=2.5
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('GPL3')
pkgdesc="Download Youtube videos to local audio or video files."
source=("https://github.com/JaGoLi/$_pkgname/archive/$pkgver.tar.gz")
sha256sums=('d725f94061819f9366e6a170e9cebd06dd6bf824d180a13976f7b1f9bd8e5754')
-conflicts=("youtubedl-gui-beta")
+provides=("youtubedl-gui")
+conflicts=("youtubedl-gui")
makedepends=("qt5-quickcontrols"
"cmake")
depends=("youtube-dl"