summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCebtenzzre2019-03-01 16:43:53 -0500
committerCebtenzzre2019-03-01 16:44:18 -0500
commit229b7b83262859d283b09592fa76e216d21ac99b (patch)
tree05ac636557a87965cfdbc23d316e64a8b6490be3
parent764a66dfea03e6790f292e15aced583693e702a6 (diff)
downloadaur-229b7b83262859d283b09592fa76e216d21ac99b.tar.gz
Specify version in provides
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD29
2 files changed, 17 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f32b695a53a..9d97a108b90c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = shiboken2-git
- pkgver = 5.12.1.r6177.b5d27d9f
+ pkgver = 5.12.2.r6266.54f48761
pkgrel = 1
url = http://www.pyside.org
arch = i686
@@ -20,14 +20,14 @@ pkgname = python2-shiboken2-git
pkgdesc = Support library for Python2 bindings
depends = python2
depends = shiboken2-git
- provides = python2-shiboken2
+ provides = python2-shiboken2=5.12.2
conflicts = python2-shiboken2
pkgname = python-shiboken2-git
pkgdesc = Support library for Python bindings
depends = python
depends = shiboken2-git
- provides = python-shiboken2
+ provides = python-shiboken2=5.12.2
conflicts = python-shiboken2
pkgname = shiboken2-git
@@ -37,6 +37,6 @@ pkgname = shiboken2-git
depends = qt5-xmlpatterns
optdepends = python2-shiboken2-git: for compilation against python2
optdepends = python-shiboken2-git: for compilation against python
- provides = shiboken2
+ provides = shiboken2=5.12.2
conflicts = shiboken2
diff --git a/PKGBUILD b/PKGBUILD
index 3d45286c82a1..41663fa0b6a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=shiboken2-git
pkgname=(python{2,}-shiboken2-git shiboken2-git)
-pkgver=5.12.1.r6177.b5d27d9f
+pkgver=5.12.2.r6266.54f48761
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL')
@@ -23,10 +23,6 @@ pkgver() {
printf "%s.r%s.%s" "$_upver" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "$srcdir/$pkgbase"
-}
-
build() {
# Build for python2.
cd "$srcdir"/$pkgbase/sources/shiboken2
@@ -51,23 +47,23 @@ package_shiboken2-git() {
depends=('libxslt' 'clang' 'qt5-xmlpatterns')
optdepends=("python2-shiboken2-git: for compilation against python2"
"python-shiboken2-git: for compilation against python")
- provides=("shiboken2")
+ provides=("shiboken2=${pkgver%%.r*}")
conflicts=("shiboken2")
cd "$srcdir"/$pkgbase/sources/shiboken2/build-py3
make DESTDIR="$pkgdir" install
+ _upver=${pkgver%%.r*}
rm -rf "$pkgdir/usr/lib/python"*
rm -rf "$pkgdir/usr/lib/libshiboken2"*
rm -rf "$pkgdir/usr/lib/pkgconfig/"
- _upver="${pkgver%%.r*}"
- rm "$pkgdir"/usr/lib/cmake/Shiboken2-$_upver/Shiboken2Config*python*.cmake
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}"/Shiboken2Config*python*.cmake
}
package_python2-shiboken2-git() {
pkgdesc="Support library for Python2 bindings"
depends=("python2" "shiboken2-git")
- provides=("python2-shiboken2")
+ provides=("python2-shiboken2=${pkgver%%.r*}")
conflicts=("python2-shiboken2")
cd "$srcdir"/$pkgbase/sources/shiboken2/build-py2
@@ -75,23 +71,24 @@ package_python2-shiboken2-git() {
mv "$pkgdir"/usr/lib/pkgconfig/shiboken2{,-py2}.pc
- rm -rf "$pkgdir"/usr/{include,bin,share}
_upver="${pkgver%%.r*}"
- rm "$pkgdir/usr/lib/cmake/Shiboken2-$_upver/Shiboken2ConfigVersion.cmake"
- rm "$pkgdir/usr/lib/cmake/Shiboken2-$_upver/Shiboken2Config.cmake"
+ rm -rf "$pkgdir"/usr/{include,bin,share}
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2ConfigVersion.cmake"
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2Config.cmake"
}
package_python-shiboken2-git() {
pkgdesc="Support library for Python bindings"
depends=("python" "shiboken2-git")
- provides=("python-shiboken2")
+ _upver="${pkgver%%.r*}"
+ provides=("python-shiboken2=${pkgver%%.r*}")
conflicts=("python-shiboken2")
cd "$srcdir"/$pkgbase/sources/shiboken2/build-py3
make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/usr/{include,bin,share}
_upver="${pkgver%%.r*}"
- rm "$pkgdir/usr/lib/cmake/Shiboken2-$_upver/Shiboken2ConfigVersion.cmake"
- rm "$pkgdir/usr/lib/cmake/Shiboken2-$_upver/Shiboken2Config.cmake"
+ rm -rf "$pkgdir"/usr/{include,bin,share}
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2ConfigVersion.cmake"
+ rm "$pkgdir/usr/lib/cmake/Shiboken2-${_upver}/Shiboken2Config.cmake"
}