2011-11-25 11:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/package/mpkg_rpm.sh
    ! fixed RPM _topdir detection.
      Patch created by Raphael Gozzo - many thanks.

  * harbour/INSTALL
    * added info about libraries necessary to build hbgs and hbmagic
      in Ubuntu.

  * harbour/contrib/hbmagic/hbmagic.hbx
    * added HB_MAGIC_SIMPLE (regenerated automatically)

harbour/ChangeLog

@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-11-25 11:38 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/package/mpkg_rpm.sh
+    ! fixed RPM _topdir detection.
+      Patch created by Raphael Gozzo - many thanks.
+
+  * harbour/INSTALL
+    * added info about libraries necessary to build hbgs and hbmagic
+      in Ubuntu.
+
+  * harbour/contrib/hbmagic/hbmagic.hbx
+    * added HB_MAGIC_SIMPLE (regenerated automatically)
+
 2011-11-23 19:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/package/harbour.spec
     ! removed hbclipsm which does not exists in current SVN

harbour/INSTALL

@@ -447,6 +447,8 @@ HARBOUR
       for contrib/hbfimage lib:  $ sudo apt-get install libfreeimage-dev
       for contrib/hbgd lib:      $ sudo apt-get install libgd2-xpm-dev OR
                                  $ sudo apt-get install libgd-xpm-dev
+      for contrib/hbgs lib:      $ sudo apt-get install libgs-dev
+      for contrib/hbmagic lib:   $ sudo apt-get install libmagic-dev
       for contrib/hbmysql lib:   $ sudo apt-get install libmysqlclient15-dev
       for contrib/hbodbc lib:    $ sudo apt-get install unixodbc-dev
       for contrib/hbpgsql lib:   $ sudo apt-get install libpq-dev

harbour/contrib/hbmagic/hbmagic.hbx

@@ -25,6 +25,7 @@
    #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
 #endif
 
+DYNAMIC HB_MAGIC_SIMPLE
 DYNAMIC MAGIC_BUFFER
 DYNAMIC MAGIC_CHECK
 DYNAMIC MAGIC_COMPILE

harbour/package/mpkg_rpm.sh

@@ -15,26 +15,6 @@ test_reqrpm()
    rpm -q --whatprovides "$1" >/dev/null 2>&1
 }
 
-get_rpmmacro()
-{
-   local R X Y
-
-   R=`rpm --showrc|sed -e "/^-14:.${1}[^a-z0-9A-Z_]/ !d" -e "s/^-14: ${1}.//"`
-   X=`echo "${R}"|sed -e "s/.*\(%{\([^}]*\)}\).*/\2/"`
-   while [ "${X}" != "${R}" ]
-   do
-      Y=`get_rpmmacro "$X"`
-      if [ -n "${Y}" ]
-      then
-         R=`echo "${R}"|sed -e "s!%{${X}}!${Y}!g"`
-         X=`echo "${R}"|sed -e "s/.*\(%{\([^}]*\)}\).*/\2/"`
-      else
-         X="${R}"
-      fi
-   done
-   echo -n "${R}"
-}
-
 NEED_RPM="make gcc binutils bash"
 
 FORCE=""
@@ -170,7 +150,7 @@ then
                   ${RPMDIR}/BUILD ${RPMDIR}/SPECS
          echo "%_topdir ${RPMDIR}" > ${HOME}/.rpmmacros
       else
-         RPMDIR=`get_rpmmacro "_topdir"`
+         RPMDIR=`rpm --eval %_topdir`
       fi
 
       mv -f ${hb_filename} ${RPMDIR}/SOURCES/