From ff1e787702c934415682f850f80b3493b9a5d78a Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 29 Jul 2010 13:47:14 +0000
Subject: [PATCH] 2010-07-29 15:46 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   - mpkg_rpm.sh   - mpkg_rpm_wce.sh   - mpkg_rpm_win.sh   -
 mpkg_src.sh   + package/mpkg_rpm.sh   + package/mpkg_rpm_wce.sh   +
 package/mpkg_rpm_win.sh   + package/mpkg_src.sh   * INSTALL     * Moved rpm
 package creator scripts to package dir.     * Update INSTALL accordingly.    
 ; Please test/review it.

---
 harbour/ChangeLog                     | 14 ++++++++++++++
 harbour/INSTALL                       |  6 +++---
 harbour/{ => package}/mpkg_rpm.sh     |  3 ++-
 harbour/{ => package}/mpkg_rpm_wce.sh |  4 ++--
 harbour/{ => package}/mpkg_rpm_win.sh |  5 ++---
 harbour/{ => package}/mpkg_src.sh     |  7 +++++--
 6 files changed, 28 insertions(+), 11 deletions(-)
 rename harbour/{ => package}/mpkg_rpm.sh (98%)
 rename harbour/{ => package}/mpkg_rpm_wce.sh (96%)
 rename harbour/{ => package}/mpkg_rpm_win.sh (97%)
 rename harbour/{ => package}/mpkg_src.sh (97%)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3c3a6aa176..db91b0e7d0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,20 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-29 15:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  - mpkg_rpm.sh
+  - mpkg_rpm_wce.sh
+  - mpkg_rpm_win.sh
+  - mpkg_src.sh
+  + package/mpkg_rpm.sh
+  + package/mpkg_rpm_wce.sh
+  + package/mpkg_rpm_win.sh
+  + package/mpkg_src.sh
+  * INSTALL
+    * Moved rpm package creator scripts to package dir.
+    * Update INSTALL accordingly.
+    ; Please test/review it.
+
 2010-07-29 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/src/compiler/gencc.c
     ! fixed wrongly used HB_ISIZ instead of HB_LONG
diff --git a/harbour/INSTALL b/harbour/INSTALL
index e132648973..dbb9c7e274 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -238,7 +238,7 @@ HARBOUR
    Binary .rpm on Linux
    --------------------
 
-      $ ./mpkg_rpm.sh
+      $ package/mpkg_rpm.sh
 
       You can fine-tune the build with these options:
          --with static      - link all binaries with static libs
@@ -266,9 +266,9 @@ HARBOUR
    -----------------------------------
 
       for Windows:
-         $ ./mpkg_rpm_win.sh
+         $ package/mpkg_rpm_win.sh
       for Windows CE:
-         $ ./mpkg_rpm_wce.sh
+         $ package/mpkg_rpm_wce.sh
 
    Binary .zip + .exe on Windows for all targets (except Linux)
    ------------------------------------------------------------
diff --git a/harbour/mpkg_rpm.sh b/harbour/package/mpkg_rpm.sh
similarity index 98%
rename from harbour/mpkg_rpm.sh
rename to harbour/package/mpkg_rpm.sh
index e5d1f8c206..48d0c73428 100755
--- a/harbour/mpkg_rpm.sh
+++ b/harbour/package/mpkg_rpm.sh
@@ -150,6 +150,7 @@ done
 
 if [ -z "${TOINST_LST}" ] || [ "${FORCE}" = "yes" ]
 then
+   cd `dirname $0`
    . ./mpkg_src.sh
    stat="$?"
    if [ -z "${hb_filename}" ]
@@ -173,7 +174,7 @@ then
       fi
 
       cp ${hb_filename} ${RPMDIR}/SOURCES/
-      cp package/harbour.spec ${RPMDIR}/SPECS/
+      cp harbour.spec ${RPMDIR}/SPECS/
 
       if which rpmbuild >/dev/null 2>&1
       then
diff --git a/harbour/mpkg_rpm_wce.sh b/harbour/package/mpkg_rpm_wce.sh
similarity index 96%
rename from harbour/mpkg_rpm_wce.sh
rename to harbour/package/mpkg_rpm_wce.sh
index 260cb2de07..c41876edc1 100755
--- a/harbour/mpkg_rpm_wce.sh
+++ b/harbour/package/mpkg_rpm_wce.sh
@@ -36,7 +36,7 @@ get_rpmmacro()
 }
 
 cd `dirname $0`
-. package/mpkg_ver.sh
+. ./mpkg_ver.sh
 hb_ver=`get_hbver`
 hb_verstat=`get_hbverstat`
 [ -n "${hb_verstat}" ] || hb_verstat="0"
@@ -90,7 +90,7 @@ then
       mv ${hb_filename} ${RPMDIR}/SOURCES/
       sed -e "s/^%define version .*$/%define version   ${hb_ver}/g" \
           -e "s/^%define releasen .*$/%define releasen  ${hb_verstat}/g" \
-         package/harbour-wce.spec > ${RPMDIR}/SPECS/harbour-wce.spec
+         harbour-wce.spec > ${RPMDIR}/SPECS/harbour-wce.spec
       if which rpmbuild >/dev/null 2>&1
       then
          RPMBLD="rpmbuild"
diff --git a/harbour/mpkg_rpm_win.sh b/harbour/package/mpkg_rpm_win.sh
similarity index 97%
rename from harbour/mpkg_rpm_win.sh
rename to harbour/package/mpkg_rpm_win.sh
index 088f26a8b2..732538aa39 100755
--- a/harbour/mpkg_rpm_win.sh
+++ b/harbour/package/mpkg_rpm_win.sh
@@ -56,9 +56,8 @@ fi
 HB_CCPREFIX="$TARGET-"
 HB_CCPATH="$MINGW_DIR/bin"
 
-
 cd `dirname $0`
-. package/mpkg_ver.sh
+. ./mpkg_ver.sh
 hb_ver=`get_hbver`
 hb_verstat=`get_hbverstat`
 [ -n "${hb_verstat}" ] || hb_verstat="0"
@@ -114,7 +113,7 @@ then
           -e "s|^%define releasen .*$|%define releasen  ${hb_verstat}|g" \
           -e "s|^%define hb_ccpath .*$|%define hb_ccpath ${HB_CCPATH}|g" \
           -e "s|^%define hb_ccpref .*$|%define hb_ccpref ${HB_CCPREFIX}|g" \
-         package/harbour-win.spec > ${RPMDIR}/SPECS/harbour-win.spec
+         harbour-win.spec > ${RPMDIR}/SPECS/harbour-win.spec
       if which rpmbuild >/dev/null 2>&1
       then
          RPMBLD="rpmbuild"
diff --git a/harbour/mpkg_src.sh b/harbour/package/mpkg_src.sh
similarity index 97%
rename from harbour/mpkg_src.sh
rename to harbour/package/mpkg_src.sh
index 04dde94d38..9b306c010a 100755
--- a/harbour/mpkg_src.sh
+++ b/harbour/package/mpkg_src.sh
@@ -24,8 +24,9 @@ hb_currdir=`pwd`
 
 hb_archopt="-czf"
 [ -n "${hb_ext}" ] || hb_ext=".tar.gz"
-if [ -f package/mpkg_ver.sh ]; then
-   hb_rootdir="."
+
+if [ -f mpkg_ver.sh ]; then
+   hb_rootdir=".."
 else
    hb_rootdir=`dirname $0`
 fi
@@ -102,3 +103,5 @@ else
    (cd "$hb_rootdir";$hb_archbin $hb_archopt $hb_filename --files-from "$hb_flst")
 fi
 [ "$hb_rmflst" != "yes" ] || rm -fR "$hb_rootdir/$hb_flst"
+
+cd "$hb_currdir"