linux-libre kernels and dependencies: add libre suffix packages on replaces and conflicts, rename $archver to $archpkgver with improvements on the variables

1 files changed, 6 insertions, 6 deletions

diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 2c62de56a..f390a3d9d 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -18,11 +18,11 @@ pkgname=("${pkgbase}-meta" "${_pkgname[@]}")
 
 _pkgbasever=3.16-gnu
 _pkgver=3.16-gnu
-_archver=3.16
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/.}
-pkgrel=1.1
+pkgrel=1.2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -132,7 +132,7 @@ package_linux-libre-tools-meta() {
   depends=("${_pkgname[@]}")
   replaces=(linux-tools-meta)
   conflicts=(linux-tools-meta)
-  provides=(linux-tools-meta=$_archver)
+  provides=(linux-tools-meta=$_archpkgver)
 }
 
 _package_libtraceevent-parabola() {
@@ -240,9 +240,9 @@ for _p in "${_pkgname[@]}"; do
     package_${_p}() {
       _package_${_p}
       depends+=(${_depends[${_p%-parabola}]})
-      replaces+=(${_p%-parabola})
-      conflicts+=(${_p%-parabola})
-      provides+=(${_p%-parabola}=${_archver})
+      replaces+=("${_p%-parabola}" "${_p/parabola/libre}")
+      conflicts+=("${_p%-parabola}" "${_p/parabola/libre}")
+      provides+=(${_p%-parabola}=${_archpkgver})
     }"
 done