From 513ee19d9eaaecf5389abf4a4b650586edd80081 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 28 Jul 2010 10:46:21 +0000
Subject: [PATCH] 2010-07-28 12:45 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * mpkg_rpm.sh     * Another shot in the dark.

  - contrib/hbdoc2
  + examples/hbdoc2
    * Moved back to examples.
    ; TODO: Should be updated to use core API to load docs and
            to generate output from the internal doc hashes.
---
 harbour/ChangeLog                                 | 10 ++++++++++
 harbour/{contrib => examples}/hbdoc2/genhtml.prg  |  0
 harbour/{contrib => examples}/hbdoc2/gentpl.prg   |  0
 harbour/{contrib => examples}/hbdoc2/gentxt.prg   |  0
 harbour/{contrib => examples}/hbdoc2/genxml.prg   |  0
 harbour/{contrib => examples}/hbdoc2/hbdoc2.ch    |  0
 harbour/{contrib => examples}/hbdoc2/hbdoc2.hbp   |  0
 harbour/{contrib => examples}/hbdoc2/hbdoc2.prg   |  0
 harbour/{contrib => examples}/hbdoc2/tmplates.prg |  0
 harbour/mpkg_rpm.sh                               | 14 ++------------
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename harbour/{contrib => examples}/hbdoc2/genhtml.prg (100%)
 rename harbour/{contrib => examples}/hbdoc2/gentpl.prg (100%)
 rename harbour/{contrib => examples}/hbdoc2/gentxt.prg (100%)
 rename harbour/{contrib => examples}/hbdoc2/genxml.prg (100%)
 rename harbour/{contrib => examples}/hbdoc2/hbdoc2.ch (100%)
 rename harbour/{contrib => examples}/hbdoc2/hbdoc2.hbp (100%)
 rename harbour/{contrib => examples}/hbdoc2/hbdoc2.prg (100%)
 rename harbour/{contrib => examples}/hbdoc2/tmplates.prg (100%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a354ba55e3..03cd4b6321 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-28 12:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_rpm.sh
+    * Another shot in the dark.
+
+  - contrib/hbdoc2
+  + examples/hbdoc2
+    * Moved back to examples.
+    ; TODO: Should be updated to use core API to load docs and
+            to generate output from the internal doc hashes.
+
 2010-07-28 11:06 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * mpkg_rpm.sh
     ! Fix to always copy harbour.spec to SPECS dir.
diff --git a/harbour/contrib/hbdoc2/genhtml.prg b/harbour/examples/hbdoc2/genhtml.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/genhtml.prg
rename to harbour/examples/hbdoc2/genhtml.prg
diff --git a/harbour/contrib/hbdoc2/gentpl.prg b/harbour/examples/hbdoc2/gentpl.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/gentpl.prg
rename to harbour/examples/hbdoc2/gentpl.prg
diff --git a/harbour/contrib/hbdoc2/gentxt.prg b/harbour/examples/hbdoc2/gentxt.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/gentxt.prg
rename to harbour/examples/hbdoc2/gentxt.prg
diff --git a/harbour/contrib/hbdoc2/genxml.prg b/harbour/examples/hbdoc2/genxml.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/genxml.prg
rename to harbour/examples/hbdoc2/genxml.prg
diff --git a/harbour/contrib/hbdoc2/hbdoc2.ch b/harbour/examples/hbdoc2/hbdoc2.ch
similarity index 100%
rename from harbour/contrib/hbdoc2/hbdoc2.ch
rename to harbour/examples/hbdoc2/hbdoc2.ch
diff --git a/harbour/contrib/hbdoc2/hbdoc2.hbp b/harbour/examples/hbdoc2/hbdoc2.hbp
similarity index 100%
rename from harbour/contrib/hbdoc2/hbdoc2.hbp
rename to harbour/examples/hbdoc2/hbdoc2.hbp
diff --git a/harbour/contrib/hbdoc2/hbdoc2.prg b/harbour/examples/hbdoc2/hbdoc2.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/hbdoc2.prg
rename to harbour/examples/hbdoc2/hbdoc2.prg
diff --git a/harbour/contrib/hbdoc2/tmplates.prg b/harbour/examples/hbdoc2/tmplates.prg
similarity index 100%
rename from harbour/contrib/hbdoc2/tmplates.prg
rename to harbour/examples/hbdoc2/tmplates.prg
diff --git a/harbour/mpkg_rpm.sh b/harbour/mpkg_rpm.sh
index bacb6ba9c6..76b4649520 100755
--- a/harbour/mpkg_rpm.sh
+++ b/harbour/mpkg_rpm.sh
@@ -38,11 +38,6 @@ get_rpmmacro()
 NEED_RPM="make gcc binutils bash"
 
 FORCE=""
-BUGGY_RPM=""
-if [ -f /etc/conectiva-release ]
-then
-   BUGGY_RPM="yes"
-fi
 
 LAST=""
 while [ $# -gt 0 ]
@@ -192,13 +187,8 @@ then
       else
          RPMBLD="rpm"
       fi
-
-      if [ "${BUGGY_RPM}" = "yes" ]
-      then
-         ${RPMBLD} -ba harbour.spec ${INST_PARAM}
-      else
-         ${RPMBLD} -ta ${hb_filename} --rmsource ${INST_PARAM}
-      fi
+      cd ${RPMDIR}/SPECS
+      ${RPMBLD} -ba harbour.spec ${INST_PARAM}
    else
       echo "Cannot find archive file: ${hb_filename}"
       exit 1