From 5df1490b1ae825f3b2422115ab13f557b1aa49e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Sun, 24 Aug 2014 17:47:55 -0300
Subject: linux-libre kernels and dependencies: add libre suffix packages on
 replaces and conflicts, rename $archver to $archpkgver with improvements on
 the variables

---
 libre/linux-libre/PKGBUILD | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libre/linux-libre/PKGBUILD')

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 077fc8cd8..1a15995e6 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -10,12 +10,12 @@
 pkgbase=linux-libre         # Build stock "" kernel
 _pkgbasever=3.16-gnu
 _pkgver=3.16.1-gnu
-_archver=3.16.1
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 _replacesalx=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/.}
 pkgrel=1.1
 arch=('i686' 'x86_64' 'mips64el')
@@ -118,7 +118,7 @@ _package() {
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=( "${_replaces[@]/%/=${_archver}}" "${_replacesalx}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}" "${_replacesalx}")
   conflicts=("${_replaces[@]}" "${_replacesalx}")
   replaces=( "${_replaces[@]}" "${_replacesalx}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -177,7 +177,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -296,7 +296,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
-- 
cgit v1.2.3-2-g168b