summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Claßen2019-05-03 20:13:26 +0200
committerPhilipp Claßen2019-05-03 20:13:26 +0200
commit6452930f2db6f05f6be537224d2f14cdb311c708 (patch)
treea495369457563919202a11f390a02c26e8dc1173
parent29cd6e2261aaa2bd9546f2b54acd53b331b554f3 (diff)
downloadaur-6452930f2db6f05f6be537224d2f14cdb311c708.tar.gz
Trying to fix package conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f2e9b501680..7fa2e04312c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Thu May 2 23:38:00 UTC 2019
+# Fri May 3 18:05:19 UTC 2019
pkgbase = gcc-multilib-trunk-git
pkgdesc = The GNU Compiler Collection developmental snapshot
pkgver = 10.0.0.r168586.9766cefe693
@@ -60,7 +60,6 @@ pkgname = gcc-objc-multilib-git
pkgname = gcc-fortran-multilib-git
pkgdesc = Fortran front-end for GCC for multilib
depends = gcc-multilib-git=10.0.0.r168586.9766cefe693-1
- provides = gcc-fortran-multilib=10.0.0.r168586.9766cefe693-1
provides = gcc-fortran=10.0.0.r168586.9766cefe693-1
conflicts = gcc-fortran
options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 66991cc1f80..4239fcd09d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -205,7 +205,7 @@ EOF
package_gcc-fortran-multilib-git() {
pkgdesc='Fortran front-end for GCC for multilib'
depends=("gcc-multilib-git=$pkgver-$pkgrel")
- provides=("gcc-fortran-multilib=${pkgver}-${pkgrel}" "gcc-fortran=${pkgver}-${pkgrel}")
+ provides=("gcc-fortran=${pkgver}-${pkgrel}")
conflicts=('gcc-fortran')
options=('!emptydirs' '!strip')