summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2017-01-24 18:25:38 +0100
committerGordian Edenhofer2017-01-24 18:25:38 +0100
commitfd271fca30595e0a13c4ec2ea1dedd63e5d4b515 (patch)
tree944ea0ecdac1ccfbd8708c7eb8c7d5ab17ac5a8b
parent6d17d250330b0802918bdea9ddf672ac94d09ef6 (diff)
downloadaur-fd271fca30595e0a13c4ec2ea1dedd63e5d4b515.tar.gz
upgpkg: slurm-llnl-* 17.02.0_0pre4-1
Remove unneeded entries from conflict field. upgpkg: slurm-llnl-git 17.02.0.0pre2.r683.g4589be047d-1
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 34351c14b0f..39812d62415 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,7 +26,6 @@ pkgbase = slurm-llnl-dev
optdepends = gtk2: enables the sview command, a simple graphical frontend
provides = slurm-llnl=17.02.0_0pre4
conflicts = slurm-llnl
- conflicts = slurm-llnl-git
backup = etc/default/slurm-llnl
source = slurm-tmpfiles.conf
source = slurm-llnl-default-conf
diff --git a/PKGBUILD b/PKGBUILD
index c9fecb2021f..f48e93ba12c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ optdepends=("hwloc: enables the task/cgroup plugin"
"gtk2: enables the sview command, a simple graphical frontend")
makedepends=('python')
provides=("slurm-llnl=${pkgver}")
-conflicts=('slurm-llnl' 'slurm-llnl-git')
+conflicts=('slurm-llnl')
backup=('etc/default/slurm-llnl')
install="${pkgname}.install"
source=("slurm-tmpfiles.conf"