summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4e19ff84f47..001cbbf1b8f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun May 6 13:03:04 UTC 2018
+# Sun May 6 13:08:30 UTC 2018
pkgbase = flatpak-builder-git
pkgdesc = Tool to build flatpaks from source
pkgver = 0.10.10+3+g4b81e2d7
@@ -27,7 +27,7 @@ pkgbase = flatpak-builder-git
depends = cpio
depends = appstream-glib
provides = flatpak-builder
- conflicts = flatpak
+ conflicts = flatpak-builder
replaces = flatpak<0.9.10
source = flatpak-builder::git+https://github.com/flatpak/flatpak-builder
source = git+https://git.gnome.org/browse/libglnx
diff --git a/PKGBUILD b/PKGBUILD
index 80a79c6ffad1..1fb967ae756d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection git docbook-xsl xmlto libdwarf)
checkdepends=(python2 valgrind)
replaces=('flatpak<0.9.10')
provides=('flatpak-builder')
-conflicts=('flatpak')
+conflicts=('flatpak-builder')
source=("flatpak-builder::git+https://github.com/flatpak/flatpak-builder"
"git+https://git.gnome.org/browse/libglnx")
sha256sums=('SKIP'