From f06c6e17115911b572c3f22cfec81b3d895a4e23 Mon Sep 17 00:00:00 2001
From: Tomaz Zupan <tomaz.zupan@orpo.si>
Date: Wed, 24 Jan 2007 22:10:17 +0000
Subject: [PATCH] 2007-01-24 23:10 UTC+0200 Tomaz Zupan <tomaz.zupan@orpo.si>  
 * harbour.spec     * Aded Mandriva One distro to platforms   * bin/hb-func.sh
     * Aded Mandriva and Mandriva One distro to platforms

---
 harbour/ChangeLog      | 5 +++++
 harbour/bin/hb-func.sh | 3 ++-
 harbour/harbour.spec   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 21438801f5..ad55c8ef4f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,11 @@
    For example:
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
+2007-01-24 23:10 UTC+0200 Tomaz Zupan <tomaz.zupan@orpo.si>
+  * harbour.spec
+    * Aded Mandriva One distro to platforms 
+  * bin/hb-func.sh
+    * Aded Mandriva and Mandriva One distro to platforms 
 
 2007-01-24 10:25 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/w32/bcc32.cf
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 9e441c95ec..fdc3142403 100644
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -21,7 +21,8 @@ get_hbplatform()
     else
         # please add your distro suffix if it not belong to the one recognized below
         # and remember that order checking can be important
-
+        [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandriva-release-One 2>/dev/null) && echo "mdk$rel"|tr -d "."`
+        [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandriva-release 2>/dev/null) && echo "mdk$rel"|tr -d "."`
         [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' mandrake-release 2>/dev/null) && echo "mdk$rel"|tr -d "."`
         [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' redhat-release 2>/dev/null) && echo "rh$rel"|tr -d "."`
         [ "${id}" = "" ] && id=`rel=$(rpm -q --queryformat='.%{VERSION}' fedora-release 2>/dev/null) && echo "fc$rel"|tr -d "."`
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 2c996ed394..6d6ba21ca6 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -31,6 +31,8 @@
 # please add your distro suffix if it not belong to the one recognized below
 # and remember that order checking can be important
 
+%define platform %(release=$(rpm -q --queryformat='%{VERSION}' mandriva-release-One 2>/dev/null) && echo "mdk$release"|tr -d ".")
+%if "%{platform}" == ""
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' mandriva-release 2>/dev/null) && echo "mdk$release"|tr -d ".")
 %if "%{platform}" == ""
 %define platform %(release=$(rpm -q --queryformat='%{VERSION}' mandrake-release 2>/dev/null) && echo "mdk$release"|tr -d ".")
@@ -53,6 +55,7 @@
 %endif
 %endif
 %endif
+%endif
 
 %define name     harbour
 %define dname    Harbour