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

@@ -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.

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