diff options
| author | Renato Caldas | 2022-02-23 01:48:54 +0000 |
|---|---|---|
| committer | GitHub | 2022-02-22 20:48:54 -0500 |
| commit | 793211a392c3cb5bdd7a9f34976d84bd28c4c588 (patch) | |
| tree | 8929b22e70f362846a86a5657dba910168167e7b | |
| parent | cedc294a041956a3045034813f79fc84f84959b0 (diff) | |
| download | aur-793211a392c3cb5bdd7a9f34976d84bd28c4c588.tar.gz | |
Add 'ogre[-docs]>=1.0' to the package conflicts (#158)
* ogre: fix split package 'provides', update pkgrel
This ensures 'ogre-docs-1.9' doesn't provide 'ogre-1.9', for instance.
* ogre: add package conflicts
Just adding 'ogre' or 'ogre-docs' wouldn't work, as it would leave out
versions >=2.0
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 10 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = ogre-1.9 pkgdesc = Scene-oriented, flexible 3D engine written in C++ pkgver = 1.9.1 - pkgrel = 6 + pkgrel = 7 url = https://www.ogre3d.org arch = x86_64 license = custom:MIT @@ -24,8 +24,6 @@ pkgbase = ogre-1.9 depends = glu depends = tinyxml depends = boost-libs - provides = ogre=1.9 - provides = ogre-docs=1.9 source = https://github.com/OGRECave/ogre/archive/v1.9.1.tar.gz source = sample-comparison-operator-const-args.patch::https://github.com/OGRECave/ogre/commit/4a430a4846d1ea68f669de6b61a72934ac153f7b.patch source = sample-comparison-operator-const-callable.patch::https://github.com/OGRECave/ogre/commit/9b1c536b85448ea971822081c7e3c775dbb5cc47.patch @@ -37,8 +35,11 @@ pkgname = ogre-1.9 optdepends = cppunit: unit testing optdepends = python: python bindings optdepends = ogre-docs: documentation + provides = ogre=1.9 + conflicts = ogre>=1.0 pkgname = ogre-docs-1.9 pkgdesc = Documentation for ogre depends = - + provides = ogre-docs=1.9 + conflicts = ogre-docs>=1.0 @@ -4,7 +4,7 @@ pkgbase=ogre-1.9 pkgname=('ogre-1.9' 'ogre-docs-1.9') pkgver=1.9.1 -pkgrel=6 +pkgrel=7 pkgdesc='Scene-oriented, flexible 3D engine written in C++' arch=('x86_64') url='https://www.ogre3d.org' @@ -13,7 +13,6 @@ depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'openexr' 'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml' 'boost-libs') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'swig' 'systemd') -provides=('ogre=1.9' 'ogre-docs=1.9') source=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz" "sample-comparison-operator-const-args.patch::https://github.com/OGRECave/ogre/commit/4a430a4846d1ea68f669de6b61a72934ac153f7b.patch" "sample-comparison-operator-const-callable.patch::https://github.com/OGRECave/ogre/commit/9b1c536b85448ea971822081c7e3c775dbb5cc47.patch" @@ -48,10 +47,11 @@ build() { } package_ogre-1.9() { + provides=('ogre=1.9') + conflicts=('ogre>=1.0') optdepends=('cppunit: unit testing' 'python: python bindings' 'ogre-docs: documentation') - cd ogre-${pkgver}/build make DESTDIR=${pkgdir} install @@ -63,6 +63,8 @@ package_ogre-1.9() { } package_ogre-docs-1.9() { + provides=('ogre-docs=1.9') + conflicts=('ogre-docs>=1.0') pkgdesc="Documentation for ogre" depends=() |