2009-11-29 10:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* mpkg_rpm.sh
  * harbour.spec
    + Added hbqt and hbxbp libraries to a new rpm package harbour-qt.
      Path submitted by Tomaz Zupan. Thanks.
    ! Converted tab to space.

harbour/ChangeLog

@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-29 10:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_rpm.sh
+  * harbour.spec
+    + Added hbqt and hbxbp libraries to a new rpm package harbour-qt.
+      Path submitted by Tomaz Zupan. Thanks.
+    ! Converted tab to space.
+
 2009-11-29 07:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbextern.ch
     ! HB_SETCODEPAGE() reference also guarded with HB_LEGACY_LEVEL2.

harbour/harbour.spec

@@ -22,6 +22,7 @@
 # --with curl        - build hbcurl lib
 # --with localzlib   - build local copy of zlib library
 # --with localpcre   - build local copy of pcre library
+# --with qt
 # --without nf       - do not build nanforum lib
 # --without gpllib   - do not build libs which needs GPL 3-rd party code
 # --without x11      - do not build GTXWC
@@ -84,7 +85,7 @@
 %define hb_ldir  export HB_LIB_INSTALL=%{_libdir}/%{name}
 %define hb_edir  export HB_ETC_INSTALL=%{hb_etcdir}
 %define hb_cmrc  export HB_COMMERCE=%{?_without_gpllib:yes}
-%define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_fbsql:hbfbird} %{?_with_allegro:gtalleg}"
+%define hb_ctrb  export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_fbsql:hbfbird} %{?_with_allegro:gtalleg} %{?_with_qt:hbqt hbxbp}"
 %define hb_env   %{hb_plat} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_local} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_edir} ; %{hb_ctrb} ; %{hb_cmrc}
 %define hb_host  www.harbour-project.org
 %define readme   README.RPM
@@ -352,6 +353,17 @@ statikus szerkeszt
 %{?_with_gd:%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.}
 %{?_with_gd:Ten pakiet udostêpnia statyczn+ biliotekê GD dla kompilatora %{dname}.}
 
+## qt library
+%{?_with_qt:%package qt}
+%{?_with_qt:Summary:        QT library bindings for %{dname} compiler}
+%{?_with_qt:Group:          Development/Languages}
+%{?_with_qt:Requires:       libqt4-devel %{name} = %{?epoch:%{epoch}:}%{version}-%{release}}
+
+%{?_with_qt:%description qt}
+%{?_with_qt:%{dname} is a Clipper compatible compiler.}
+%{?_with_qt:This package provides %{dname} QT libraries for program linking.}
+
+
 ######################################################################
 ## Preperation.
 ######################################################################
@@ -674,7 +686,16 @@ rm -rf $RPM_BUILD_ROOT
 %{?_with_gd:%dir %{_libdir}/%{name}}
 %{?_with_gd:%{_libdir}/%{name}/libhbgd.a}
 
-######################################################################
+%{?_with_qt:%files qt}
+%{?_with_qt:%defattr(644,root,root,755)}
+%{?_with_qt:%dir %{_libdir}/%{name}}
+%{?_with_qt:%{_libdir}/%{name}/libhbqt.a}
+%{?_with_qt:%{_libdir}/%{name}/libhbqtcore.a}
+%{?_with_qt:%{_libdir}/%{name}/libhbqtgui.a}
+%{?_with_qt:%{_libdir}/%{name}/libhbqtnetwork.a}
+%{?_with_qt:%{_libdir}/%{name}/libhbxbp.a}
+
+####################################################################
 ## Spec file Changelog.
 ######################################################################
 

harbour/mpkg_rpm.sh

@@ -20,6 +20,7 @@
 # --with odbc        - build hbodbc lib and sddodbc for sqlrdd
 # --with ads         - build rddads RDD
 # --with gd          - build hbgd lib
+# --with qt          - build hbqt and hbxbp
 # --with allegro     - build GTALLEG - Allegro based GT driver
 # --with localzlib   - build local copy of zlib library
 # --with localpcre   - build local copy of pcre library
@@ -86,6 +87,7 @@ do
             [ "$1" = "pgsql" ] && NEED_RPM="${NEED_RPM} postgresql-devel"
             [ "$1" = "fbsql" ] && NEED_RPM="${NEED_RPM} firebird-devel"
             [ "$1" = "allegro" ] && NEED_RPM="${NEED_RPM} allegro-devel"
+            [ "$1" = "qt" ] && NEED_RPM="${NEED_RPM} libqt4-devel"
         fi
     fi
     LAST="$1"
@@ -121,6 +123,10 @@ if test_reqrpm "curl-devel"
 then
     INST_PARAM="${INST_PARAM} --with curl"
 fi
+if test_reqrpm "libqt4-devel"
+then
+    INST_PARAM="${INST_PARAM} --with qt"
+fi
 if [ -f /usr/local/ads/acesdk/ace.h ] || [ -f ${HOME}/ads/acesdk/ace.h ]
 then
     INST_PARAM="${INST_PARAM} --with ads"