From 84bdb98f7b908f0c51143262a71fee275e3e9145 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Thu, 24 Jul 2014 13:44:48 +0200
Subject: [PATCH] openmamba-netsrpms: update also b43-firmware and
 msttcorefonts to latest changes

---
 SRPMS/b43-firmware/b43-firmware.spec.in   |  5 ++--
 SRPMS/b43-firmware/distroutils.sysconfig  |  2 +-
 SRPMS/msttcorefonts/msttcorefonts.spec.in |  4 ++--
 SRPMSVERSIONS                             | 29 ++++++++++++++---------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/SRPMS/b43-firmware/b43-firmware.spec.in b/SRPMS/b43-firmware/b43-firmware.spec.in
index 70202ac..bd81a1d 100644
--- a/SRPMS/b43-firmware/b43-firmware.spec.in
+++ b/SRPMS/b43-firmware/b43-firmware.spec.in
@@ -1,6 +1,6 @@
 Name:          b43-firmware
-Version:       1
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       Broadcom firmware files for the b43 and b43legacy drivers
 Group:         System/Kernel and Hardware
@@ -22,6 +22,7 @@ Broadcom firmware files for the b43 and b43legacy drivers.
 %setup -c -n %{name}-%{version} -T
 
 [ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@
 
 [ "${B43_FIRMWARE_PCK}" ] || exit 1
diff --git a/SRPMS/b43-firmware/distroutils.sysconfig b/SRPMS/b43-firmware/distroutils.sysconfig
index afaff4d..b0b1adf 100644
--- a/SRPMS/b43-firmware/distroutils.sysconfig
+++ b/SRPMS/b43-firmware/distroutils.sysconfig
@@ -1,7 +1,7 @@
 ## Broadcom B43 firmware
 
 # package name (do not modify unless you know what you're doing)
-B43_FIRMWARE_PCK=broadcom-wl-4.150.10.5.tar.bz2
+B43_FIRMWARE_PCK=broadcom-wl-${SRPMVERSION["b43-firmware"]}.tar.bz2
 
 # package URL (do not modify unless you know what you're doing)
 B43_FIRMWARE_URL=http://mirror2.openwrt.org/sources/
diff --git a/SRPMS/msttcorefonts/msttcorefonts.spec.in b/SRPMS/msttcorefonts/msttcorefonts.spec.in
index e3e8340..93a059c 100644
--- a/SRPMS/msttcorefonts/msttcorefonts.spec.in
+++ b/SRPMS/msttcorefonts/msttcorefonts.spec.in
@@ -13,8 +13,8 @@
 %define name msttcorefonts
 
 Name:          %{name}
-Version:       1.3
-Release:       7@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Summary:       TrueType core fonts for the web
 Group:         Graphical Desktop/Fonts
 Vendor:        @vendor@
diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS
index 4a32bd7..ff0105f 100644
--- a/SRPMSVERSIONS
+++ b/SRPMSVERSIONS
@@ -1,17 +1,24 @@
+# b43-firmware
+SRPMVERSION["b43-firmware"]=4.150.10.5
+SRPMRELEASE["b43-firmware"]=1mamba
+# flashplugin
 SRPMVERSION["flashplugin"]=11.2.202.394
 SRPMRELEASE["flashplugin"]=1mamba
-
-SRPMVERSION["win32codecs"]=20110131
-SRPMRELEASE["win32codecs"]=1mamba
-
+# msttcorefonts
+SRPMVERSION["msttcorefonts"]=1.3
+SRPMRELEASE["msttcorefonts"]=7mamba
+# skype
 SRPMVERSION["skype"]=4.3.0.37
 SRPMRELEASE["skype"]=1mamba
-
-SRPMVERSION["virtualbox-extension-pack"]=4.3.12
-SRPMRELEASE["virtualbox-extension-pack"]=1mamba
-
-SRPMVERSION["sun-java7"]=7u51
-SRPMRELEASE["sun-java7"]=2mamba
-
+# spotify
 SRPMVERSION["spotify"]=20140117
 SRPMRELEASE["spotify"]=1mamba
+# sun-java7
+SRPMVERSION["sun-java7"]=7u51
+SRPMRELEASE["sun-java7"]=2mamba
+# virtualbox-extension-pack
+SRPMVERSION["virtualbox-extension-pack"]=4.3.12
+SRPMRELEASE["virtualbox-extension-pack"]=1mamba
+# win32codecs
+SRPMVERSION["win32codecs"]=20110131
+SRPMRELEASE["win32codecs"]=1mamba