summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordian Edenhofer2017-01-24 18:25:38 +0100
committerGordian Edenhofer2017-01-24 18:25:38 +0100
commit1c96a33cae077627ba599544c2b005c8adfd43db (patch)
tree30296b8767ae4061064fec8e759167e7c5bcf042
parent717e867422368c3a5199cac40c77f269a72620bf (diff)
downloadaur-1c96a33cae077627ba599544c2b005c8adfd43db.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 a28d73d9546..34b73b29cee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,6 @@ pkgbase = slurm-llnl-git
optdepends = gtk2: enables the sview command, a simple graphical frontend
provides = slurm-llnl=17.02.0.0pre2.r683.g4589be047d
conflicts = slurm-llnl
- conflicts = slurm-llnl-dev
backup = etc/default/slurm-llnl
source = slurm-tmpfiles.conf
source = slurm-llnl-default-conf
diff --git a/PKGBUILD b/PKGBUILD
index 683da8064de..dcab8af0752 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,7 +27,7 @@ optdepends=("hwloc: enables the task/cgroup plugin"
"gtk2: enables the sview command, a simple graphical frontend")
makedepends=('python' 'git')
provides=("slurm-llnl=${pkgver}")
-conflicts=('slurm-llnl' 'slurm-llnl-dev')
+conflicts=('slurm-llnl')
backup=('etc/default/slurm-llnl')
install="${pkgname}.install"
source=("slurm-tmpfiles.conf"