git » catch2-v2.git » commit 1b95260

upgpkg: 2.13.10-2

author Andreas Radke
2024-01-05 21:10:04 UTC
committer Andreas Radke
2024-01-05 21:10:04 UTC
parent 456309fcce71a46c3a3a009b5d2ae864b6eb8a48

upgpkg: 2.13.10-2

.SRCINFO +2 -1
PKGBUILD +2 -1

diff --git a/.SRCINFO b/.SRCINFO
index d72d767..4c17cb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = catch2-v2
 	pkgdesc = Modern, C++-native, header-only, test framework for unit-tests, TDD and BDD
 	pkgver = 2.13.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/catchorg/catch2
 	arch = any
 	license = Boost
 	makedepends = git
 	makedepends = cmake
 	makedepends = python
+	conflicts = catch2
 	source = catch2::git+https://github.com/catchorg/Catch2#commit=182c910b4b63ff587a3440e08f84f70497e49a81?signed
 	validpgpkeys = E29C46F3B8A7502860793B7DECC9C20E314B2360
 	validpgpkeys = 81E70B717FFB27AFDB45F52090BBFF120F9C087B
diff --git a/PKGBUILD b/PKGBUILD
index 51251a9..e82c925 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@
 pkgname=catch2-v2
 _gitcommit=182c910b4b63ff587a3440e08f84f70497e49a81
 pkgver=2.13.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Modern, C++-native, header-only, test framework for unit-tests, TDD and BDD"
 arch=('any')
 url="https://github.com/catchorg/catch2"
 license=('Boost')
 makedepends=('git' 'cmake' 'python') # python seems to be necessary for building tests (FS#60273)
+conflicts=('catch2')
 source=(${pkgname/-v2}::"git+https://github.com/catchorg/Catch2#commit=${_gitcommit}?signed")
 sha512sums=('SKIP')
 validpgpkeys=(