From 5df1490b1ae825f3b2422115ab13f557b1aa49e9 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <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

---
 kernels/linux-libre-rt/PKGBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index f7d9dda81..d8f6b4b31 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -13,13 +13,13 @@
 pkgbase=linux-libre-rt      # Build stock -rt kernel
 _pkgbasever=3.14-gnu
 _pkgver=3.14.12-gnu
-_archver=3.14.12
 _rtbasever=3.14
 _rtpatchver=rt9
 
 _replaces=('kernel26%' 'linux%') # '%' gets replaced with _kernelname
 
 _srcname=linux-${_pkgbasever%-*}
+_archpkgver=${pkgver%-*}_${_rtpatchver}
 pkgver=${_pkgver//-/.}_${_rtpatchver}
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
@@ -29,7 +29,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
-        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_archver}-${_rtpatchver}.patch.xz"
+        "http://www.kernel.org/pub/linux/kernel/projects/rt/${_rtbasever}/patch-${_pkgver%-*}-${_rtpatchver}.patch.xz"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.mips64el'
         # standard config files for mkinitcpio ramdisk
@@ -145,7 +145,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}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/=${_archpkgver}}")
   conflicts=("${_replaces[@]}")
   replaces=( "${_replaces[@]}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
@@ -204,7 +204,7 @@ _package() {
 
 _package-headers() {
   pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-headers=${_archver}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/-headers=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-headers}")
   replaces=( "${_replaces[@]/%/-headers}")
 
@@ -323,7 +323,7 @@ _package-headers() {
 
 _package-docs() {
   pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=( "${_replaces[@]/%/-docs=${_archver}.${_rtpatchver}}")
+  provides=( "${_replaces[@]/%/-docs=${_archpkgver}}")
   conflicts=("${_replaces[@]/%/-docs}")
   replaces=( "${_replaces[@]/%/-docs}")
 
-- 
cgit v1.2.3