From bfc607d9fb634da276ef39c1f5bb7c2a5d2a025f Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sun, 2 Dec 2007 03:00:51 +0000 Subject: [PATCH] 2007-12-02 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/mouse53.c * do not include unnecessary header files * harbour/bin/pack_src.sh * changed packing procedure - now it does not scan chosen directories and files but all contents of all .svn/entries to extract files stores in SVN repository and then pack them - it's very good method to pack whole Harbour repository without .svn/* data and risk of packing local files. * harbour/harbour.spec * harbour/harbour-ce-spec * harbour/harbour-w32-spec * updated for recent changes in directory and library names --- harbour/ChangeLog | 16 ++ harbour/bin/pack_src.sh | 466 +---------------------------------- harbour/harbour-ce-spec | 18 +- harbour/harbour-w32-spec | 18 +- harbour/harbour.spec | 19 +- harbour/source/rtl/mouse53.c | 3 +- 6 files changed, 60 insertions(+), 480 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2c912ee9f5..cfb33a94bc 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,22 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-02 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/rtl/mouse53.c + * do not include unnecessary header files + + * harbour/bin/pack_src.sh + * changed packing procedure - now it does not scan chosen directories + and files but all contents of all .svn/entries to extract files + stores in SVN repository and then pack them - it's very good method + to pack whole Harbour repository without .svn/* data and risk of + packing local files. + + * harbour/harbour.spec + * harbour/harbour-ce-spec + * harbour/harbour-w32-spec + * updated for recent changes in directory and library names + 2007-12-01 23:55 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) * harbour/source/lang/msgltwin.c * svn properties diff --git a/harbour/bin/pack_src.sh b/harbour/bin/pack_src.sh index af0fef9d1b..23f372b19e 100755 --- a/harbour/bin/pack_src.sh +++ b/harbour/bin/pack_src.sh @@ -18,463 +18,23 @@ fi hb_ver=`get_hbver ${hb_rootdir}` hb_filename="harbour-${hb_ver}.src${hb_ext}" -[ -f $hb_filename ] && rm -f $hb_filename +rm -f $hb_filename #[ -z "$TZ" ] && export TZ=PST8PDT hb_collect_all() { - -hb_collect="echo" - -# README.TXT - -# ROOT -$hb_collect *.bat -$hb_collect *.sh -$hb_collect *.cmd -$hb_collect *.mak -$hb_collect *.spec -$hb_collect [Mm]akefile* -$hb_collect Change[Ll]og* -$hb_collect COPYING TODO ERRATA - -# BIN -$hb_collect bin/*.bat -$hb_collect bin/*.cmd -$hb_collect bin/*.sh - -# CONFIG -$hb_collect config/*.cf -$hb_collect config/dos/*.cf -$hb_collect config/linux/*.cf -$hb_collect config/bsd/*.cf -$hb_collect config/darwin/*.cf -$hb_collect config/hpux/*.cf -$hb_collect config/sunos/*.cf -$hb_collect config/os2/*.cf -$hb_collect config/w32/*.cf - -# DOC -$hb_collect doc/[Mm]akefile* -$hb_collect doc/*.txt -$hb_collect doc/genhtm.* -$hb_collect doc/en/[Mm]akefile* -$hb_collect doc/en/*.txt -$hb_collect doc/es/[Mm]akefile* -$hb_collect doc/es/*.txt -$hb_collect doc/man/*.1* - -# DEBIAN -$hb_collect debian/* - -# INCLUDE -$hb_collect include/Makefile -$hb_collect include/*.[ch] -$hb_collect include/*.api -$hb_collect include/*.ch - -# SOURCE -$hb_collect source/Makefile - -# SOURCE\MAIN -$hb_collect source/main/Makefile -$hb_collect source/main/*.[ch] - -# SOURCE\COMPILER -$hb_collect source/compiler/Makefile -$hb_collect source/compiler/*.[cylh] -$hb_collect source/compiler/*.yy[ch] - -# SOURCE\COMMON -$hb_collect source/common/Makefile -$hb_collect source/common/*.[ch] - -# SOURCE\PP -$hb_collect source/pp/Makefile -$hb_collect source/pp/*.[ch] - -# SOURCE\DEBUG -$hb_collect source/debug/Makefile -$hb_collect source/debug/*.[ch] -$hb_collect source/debug/*.prg - -# SOURCE\LANG -$hb_collect source/lang/Makefile -$hb_collect source/lang/*.[ch] - -# SOURCE\CODEPAGE -$hb_collect source/codepage/Makefile -$hb_collect source/codepage/*.[ch] - -# SOURCE\MACRO -$hb_collect source/macro/Makefile -$hb_collect source/macro/*.[cylh] -$hb_collect source/macro/*.yy[ch] - -# SOURCE\HBPCRE -$hb_collect source/hbpcre/Makefile -$hb_collect source/hbpcre/ChangeLog* -$hb_collect source/hbpcre/*.[ch] - -# SOURCE\RDD -$hb_collect source/rdd/Makefile -$hb_collect source/rdd/*.[ch] -$hb_collect source/rdd/*.prg - -# SOURCE\RDD\DBFDBT -#$hb_collect source/rdd/dbfdbt/Makefile -#$hb_collect source/rdd/dbfdbt/*.[ch] -#$hb_collect source/rdd/dbfdbt/*.prg - -# SOURCE\RDD\DBFFPT -$hb_collect source/rdd/dbffpt/Makefile -$hb_collect source/rdd/dbffpt/*.[ch] -$hb_collect source/rdd/dbffpt/*.prg - -# SOURCE\RDD\DBFCDX -$hb_collect source/rdd/dbfcdx/Makefile -$hb_collect source/rdd/dbfcdx/*.[ch] -$hb_collect source/rdd/dbfcdx/*.prg - -# SOURCE\RDD\DBFNTX -$hb_collect source/rdd/dbfntx/Makefile -$hb_collect source/rdd/dbfntx/*.[ch] -$hb_collect source/rdd/dbfntx/*.prg - -# SOURCE\RDD\HBSIX -$hb_collect source/rdd/hbsix/Makefile -$hb_collect source/rdd/hbsix/*.[ch] -$hb_collect source/rdd/hbsix/*.ch -$hb_collect source/rdd/hbsix/*.prg - -# SOURCE\RDD\HSX -$hb_collect source/rdd/hsx/Makefile -$hb_collect source/rdd/hsx/*.[ch] -$hb_collect source/rdd/hsx/*.ch -$hb_collect source/rdd/hsx/*.prg - -# SOURCE\RDD\USRRDD -$hb_collect source/rdd/usrrdd/Makefile -$hb_collect source/rdd/usrrdd/*.c -$hb_collect source/rdd/usrrdd/example/*.prg -$hb_collect source/rdd/usrrdd/rdds/Makefile -$hb_collect source/rdd/usrrdd/rdds/*.prg - -# SOURCE\RDD\NULSYS -$hb_collect source/rdd/nulsys/Makefile -$hb_collect source/rdd/nulsys/*.c - -for d in ${HB_DB_DRVEXT} -do - $hb_collect source/rdd/$d/Makefile - $hb_collect source/rdd/$d/*.[ch] - $hb_collect source/rdd/$d/*.ch - $hb_collect source/rdd/$d/*.prg -done - -# SOURCE\RTL -$hb_collect source/rtl/Makefile -$hb_collect source/rtl/*.[ch] -$hb_collect source/rtl/*.prg - -# SOURCE\RTL\GT_TPL -$hb_collect source/rtl/gt_tpl/Makefile -$hb_collect source/rtl/gt_tpl/*.[ch] - -# SOURCE\RTL\GTCGI -$hb_collect source/rtl/gtcgi/Makefile -$hb_collect source/rtl/gtcgi/*.[ch] - -# SOURCE\RTL\GTCRS -$hb_collect source/rtl/gtcrs/Makefile -$hb_collect source/rtl/gtcrs/*.[ch] -$hb_collect source/rtl/gtcrs/*.def -$hb_collect source/rtl/gtcrs/*.map -$hb_collect source/rtl/gtcrs/*.prg - -# SOURCE\RTL\GTDOS -$hb_collect source/rtl/gtdos/Makefile -$hb_collect source/rtl/gtdos/*.[ch] - -# SOURCE\RTL\GTGUI -$hb_collect source/rtl/gtgui/Makefile -$hb_collect source/rtl/gtgui/*.[ch] - -# SOURCE\RTL\GTOS2 -$hb_collect source/rtl/gtos2/Makefile -$hb_collect source/rtl/gtos2/*.[ch] - -# SOURCE\RTL\GTPCA -$hb_collect source/rtl/gtpca/Makefile -$hb_collect source/rtl/gtpca/*.[ch] - -# SOURCE\RTL\GTSLN -$hb_collect source/rtl/gtsln/Makefile -$hb_collect source/rtl/gtsln/*.[ch] - -# SOURCE\RTL\GTSTD -$hb_collect source/rtl/gtstd/Makefile -$hb_collect source/rtl/gtstd/*.[ch] - -# SOURCE\RTL\GTTRM -$hb_collect source/rtl/gttrm/Makefile -$hb_collect source/rtl/gttrm/*.[ch] - -# SOURCE\RTL\GTWIN -$hb_collect source/rtl/gtwin/Makefile -$hb_collect source/rtl/gtwin/*.[ch] - -# SOURCE\RTL\GTWVT -$hb_collect source/rtl/gtwvt/Makefile* -$hb_collect source/rtl/gtwvt/*.[ch] - -# SOURCE\RTL\GTXVT -$hb_collect source/rtl/gtxvt/Makefile* -$hb_collect source/rtl/gtxvt/*.[ch] - -# SOURCE\RTL\GTXWC -$hb_collect source/rtl/gtxwc/Makefile* -$hb_collect source/rtl/gtxwc/*.[ch] - -# SOURCE\RTL\GTALLEG -$hb_collect source/rtl/gtalleg/Makefile* -$hb_collect source/rtl/gtalleg/*.[ch] -$hb_collect source/rtl/gtalleg/*.sfc - -# SOURCE\VM -$hb_collect source/vm/Makefile -$hb_collect source/vm/*.[ch] -$hb_collect source/vm/*.prg - -# SOURCE\VM\MAINSTD -$hb_collect source/vm/mainstd/Makefile - -# SOURCE\VM\MAINWIN -$hb_collect source/vm/mainwin/Makefile - -# TESTS -$hb_collect tests/Makefile -$hb_collect tests/*.bat -$hb_collect tests/*.ch -$hb_collect tests/*.cfm -$hb_collect tests/*.ini -$hb_collect tests/*.dbf -$hb_collect tests/*.fpt -$hb_collect tests/*.frm -$hb_collect tests/*.lbl -$hb_collect tests/*.prg -$hb_collect tests/*.src -$hb_collect tests/*.txt -$hb_collect tests/*.[ch] - -# TESTS\BLDTEST -$hb_collect tests/bldtest/Makefile -$hb_collect tests/bldtest/*.[ch] - -# UTILS -$hb_collect utils/Makefile - -# UTILS\HBDOC -$hb_collect utils/hbdoc/Makefile -$hb_collect utils/hbdoc/*.ch -$hb_collect utils/hbdoc/*.prg - -# UTILS\HBEXTERN -$hb_collect utils/hbextern/Makefile -$hb_collect utils/hbextern/*.bat -$hb_collect utils/hbextern/*.prg - -# UTILS\HBMAKE -$hb_collect utils/hbmake/Makefile -$hb_collect utils/hbmake/*.ch -$hb_collect utils/hbmake/*.prg -$hb_collect utils/hbmake/*.[ch] - -# UTILS\HBPP -$hb_collect utils/hbpp/Makefile -$hb_collect utils/hbpp/*.[ch] - -# UTILS\HBPPTEST -$hb_collect utils/hbpptest/Makefile -$hb_collect utils/hbpptest/*.bat -$hb_collect utils/hbpptest/*.prg - -# UTILS\HBRUN -$hb_collect utils/hbrun/Makefile -$hb_collect utils/hbrun/*.prg - -# UTILS\HBDOT -$hb_collect utils/hbdot/Makefile -$hb_collect utils/hbdot/*.prg - -# UTILS\HBTEST -$hb_collect utils/hbtest/Makefile -$hb_collect utils/hbtest/*.ch -$hb_collect utils/hbtest/*.cmd -$hb_collect utils/hbtest/*.prg - -# UTILS\HBVER -$hb_collect utils/hbver/Makefile -$hb_collect utils/hbver/*.[ch] - -# CONTRIB -$hb_collect contrib/Makefile - -# CONTRIB\RDD_ADS -$hb_collect contrib/rdd_ads/[Mm]akefile* -$hb_collect contrib/rdd_ads/*.[ch] -$hb_collect contrib/rdd_ads/*.prg -$hb_collect contrib/rdd_ads/*.ch -$hb_collect contrib/rdd_ads/*.txt -$hb_collect contrib/rdd_ads/*.bat - -# CONTRIB\LIBCT -$hb_collect contrib/libct/[Mm]akefile* -$hb_collect contrib/libct/*.[ch] -$hb_collect contrib/libct/*.prg -$hb_collect contrib/libct/*.ch -$hb_collect contrib/libct/*.txt -$hb_collect contrib/libct/*.bat - -# CONTRIB\LIBNF -$hb_collect contrib/libnf/[Mm]akefile* -$hb_collect contrib/libnf/*.[ch] -$hb_collect contrib/libnf/*.prg -$hb_collect contrib/libnf/*.ch -$hb_collect contrib/libnf/*.txt -$hb_collect contrib/libnf/*.bat - -# CONTRIB\DOT -$hb_collect contrib/dot/[Mm]akefile* -$hb_collect contrib/dot/*.prg -$hb_collect contrib/dot/*.ch -$hb_collect contrib/dot/*.txt - -# CONTRIB\TIP -$hb_collect contrib/tip/[Mm]akefile* -$hb_collect contrib/tip/Change[Ll]og* -$hb_collect contrib/tip/*.[ch] -$hb_collect contrib/tip/*.prg -$hb_collect contrib/tip/*.ch -$hb_collect contrib/tip/*.txt -$hb_collect contrib/tip/*.bat - -# CONTRIB\XHB -$hb_collect contrib/xhb/[Mm]akefile* -$hb_collect contrib/xhb/*.[ch] -$hb_collect contrib/xhb/*.prg -$hb_collect contrib/xhb/*.ch -$hb_collect contrib/xhb/*.bat - -# CONTRIB\ODBC -$hb_collect contrib/odbc/Makefile -$hb_collect contrib/odbc/*.[ch] -$hb_collect contrib/odbc/*.ch -$hb_collect contrib/odbc/*.prg -$hb_collect contrib/odbc/*.txt - -# CONTRIB\ADORDD -$hb_collect contrib/adordd/[Mm]akefile* -$hb_collect contrib/adordd/*.[ch] -$hb_collect contrib/adordd/*.prg -$hb_collect contrib/adordd/*.ch -$hb_collect contrib/adordd/*.bat - -# CONTRIB\WIN32 -$hb_collect contrib/win32/[Mm]akefile* -$hb_collect contrib/win32/*.[ch] -$hb_collect contrib/win32/*.prg -$hb_collect contrib/win32/*.ch -$hb_collect contrib/win32/*.bat -$hb_collect contrib/win32/test/*.prg - -# CONTRIB\PGSQL -$hb_collect contrib/pgsql/[mM]akefile* -$hb_collect contrib/pgsql/Change[Ll]og* -$hb_collect contrib/pgsql/README* -$hb_collect contrib/pgsql/readme* -$hb_collect contrib/pgsql/*.[ch] -$hb_collect contrib/pgsql/*.ch -$hb_collect contrib/pgsql/*.prg -$hb_collect contrib/pgsql/*.txt -$hb_collect contrib/pgsql/*.bat -$hb_collect contrib/pgsql/test/[mM]akefile* -$hb_collect contrib/pgsql/test/*.prg -$hb_collect contrib/win32/*.bat - -# CONTRIB\MYSQL -$hb_collect contrib/mysql/[mM]akefile* -$hb_collect contrib/mysql/*.[ch] -$hb_collect contrib/mysql/*.ch -$hb_collect contrib/mysql/*.prg -$hb_collect contrib/mysql/*.txt -$hb_collect contrib/mysql/*.bat - -# CONTRIB\GD -$hb_collect contrib/gd/[mM]akefile* -$hb_collect contrib/gd/Change[Ll]og* -$hb_collect contrib/gd/README* -$hb_collect contrib/gd/readme* -$hb_collect contrib/gd/*.[ch] -$hb_collect contrib/gd/include/*.[ch] -$hb_collect contrib/gd/*.ch -$hb_collect contrib/gd/*.prg -$hb_collect contrib/gd/*.txt -$hb_collect contrib/gd/*.bat -$hb_collect contrib/gd/doc/COPYING -$hb_collect contrib/gd/doc/*.txt -$hb_collect contrib/gd/tests/*.prg -$hb_collect contrib/gd/tests/*.bat -$hb_collect contrib/gd/tests/*.sh -$hb_collect contrib/gd/tests/digits/*.gif -$hb_collect contrib/gd/tests/images_in/*.jpeg -$hb_collect contrib/gd/tests/images_in/*.png -$hb_collect contrib/gd/tests/images_in/*.gif -$hb_collect contrib/gd/tests/images_out/EMPTY* - -# CONTRIB\BTREE -$hb_collect contrib/btree/[mM]akefile* -$hb_collect contrib/btree/*.[ch] -$hb_collect contrib/btree/*.api -$hb_collect contrib/btree/*.ch -$hb_collect contrib/btree/*.prg -$hb_collect contrib/btree/*.bat -$hb_collect contrib/btree/doc/*.txt - -# CONTRIB\HTMLLIB -$hb_collect contrib/htmllib/[mM]akefile* -$hb_collect contrib/htmllib/*.ch -$hb_collect contrib/htmllib/*.prg -$hb_collect contrib/htmllib/*.bat - -# CONTRIB\LIBGT -$hb_collect contrib/libgt/[Mm]akefile* -$hb_collect contrib/libgt/*.[ch] -$hb_collect contrib/libgt/*.bat -$hb_collect contrib/libgt/doc/gen* -$hb_collect contrib/libgt/doc/lib* -$hb_collect contrib/libgt/doc/en/*.txt - -# CONTRIB\LIBMISC -$hb_collect contrib/libmisc/[mM]akefile* -$hb_collect contrib/libmisc/*.[ch] -$hb_collect contrib/libmisc/*.ch -$hb_collect contrib/libmisc/*.prg -$hb_collect contrib/libmisc/*.bat -$hb_collect contrib/libmisc/doc/gen* -$hb_collect contrib/libmisc/doc/lib* -$hb_collect contrib/libmisc/doc/en/*.txt - -# CONTRIB\SAMPLES -$hb_collect contrib/samples/[mM]akefile* -$hb_collect contrib/samples/*.[ch] -$hb_collect contrib/samples/*.ch -$hb_collect contrib/samples/*.prg -$hb_collect contrib/samples/*.bat - + for d in `find . -name ".svn"` + do + for f in `sed -e '/^[ ]*name="..*"$/ !d' -e 's/^[ ]*name="\(.*\)"$/\1/g' $d/entries` + do + f="`dirname $d`/$f" + [ -f "$f" ] && echo "$f" + done + done } -hb_flst=`cd "$hb_rootdir";hb_collect_all|grep -v "[*?[]"` - -$hb_archbin $hb_archopt $hb_filename $hb_flst +hb_flst="$hb_rootdir/bin/hb_flst.tmp" +(cd "$hb_rootdir";hb_collect_all) > "$hb_flst" +$hb_archbin $hb_archopt $hb_filename --files-from "$hb_flst" +rm -fR "$hb_flst" diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 189b47a60f..79acf12bea 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -317,26 +317,28 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhsx.a %{_libdir}/%{name}/libhbsix.a %{_libdir}/%{name}/librtl.a -%{_libdir}/%{name}/libsamples.a %{_libdir}/%{name}/libvm.a %{_libdir}/%{name}/libmainstd.a %{_libdir}/%{name}/libmainwin.a %{_libdir}/%{name}/libusrrdd.a -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} +%{?_with_adsrdd: %{_libdir}/%{name}/libhbrddads.a} %{!?_without_odbc: %{_libdir}/%{name}/libhbodbc.a} -%{!?_without_nf: %{_libdir}/%{name}/libnf.a} +%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpg.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a -%{_libdir}/%{name}/libhtml.a %{_libdir}/%{name}/libhbmisc.a -%{_libdir}/%{name}/libct.a -%{_libdir}/%{name}/libtip.a +%{_libdir}/%{name}/libhbct.a +%{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a -%{_libdir}/%{name}/libadordd.a -%{_libdir}/%{name}/libhbwin32.a +%{_libdir}/%{name}/libhbrddado.a +%{_libdir}/%{name}/libhbw32.a +%{_libdir}/%{name}/libhbgtwvg.a +%{_libdir}/%{name}/libhbgt.a +%{_libdir}/%{name}/libhbbmcdx.a +%{_libdir}/%{name}/libhbclipsm.a %defattr(755,root,root,755) %{_libdir}/%{name}/*.dll diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 69a4174c65..a408f2b91d 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -317,25 +317,27 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhsx.a %{_libdir}/%{name}/libhbsix.a %{_libdir}/%{name}/librtl.a -%{_libdir}/%{name}/libsamples.a %{_libdir}/%{name}/libvm.a %{_libdir}/%{name}/libmainstd.a %{_libdir}/%{name}/libusrrdd.a -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} +%{?_with_adsrdd: %{_libdir}/%{name}/libhbrddads.a} %{!?_without_odbc: %{_libdir}/%{name}/libhbodbc.a} -%{!?_without_nf: %{_libdir}/%{name}/libnf.a} +%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} %{?_with_pgsql: %{_libdir}/%{name}/libhbpg.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a -%{_libdir}/%{name}/libhtml.a %{_libdir}/%{name}/libhbmisc.a -%{_libdir}/%{name}/libct.a -%{_libdir}/%{name}/libtip.a +%{_libdir}/%{name}/libhbct.a +%{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a -%{_libdir}/%{name}/libadordd.a -%{_libdir}/%{name}/libhbwin32.a +%{_libdir}/%{name}/libhbrddado.a +%{_libdir}/%{name}/libhbw32.a +%{_libdir}/%{name}/libhbgtwvg.a +%{_libdir}/%{name}/libhbgt.a +%{_libdir}/%{name}/libhbbmcdx.a +%{_libdir}/%{name}/libhbclipsm.a %defattr(755,root,root,755) %{_libdir}/%{name}/*.dll diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 0b69db5616..b4a3622076 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -80,7 +80,7 @@ %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} %define hb_cmrc export HB_COMMERCE=%{?_without_gpl:yes} -%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_gd:gd} %{?_with_pgsql:pgsql} %{?_with_mysql:mysql}" +%define hb_ctrb export HB_CONTRIBLIBS="%{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql}" %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org @@ -502,26 +502,27 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhsx.a %{_libdir}/%{name}/libhbsix.a %{_libdir}/%{name}/librtl.a -%{_libdir}/%{name}/libsamples.a %{_libdir}/%{name}/libvm.a %{_libdir}/%{name}/libusrrdd.a %files contrib %defattr(644,root,root,755) %dir %{_libdir}/%{name} -%{!?_without_nf: %{_libdir}/%{name}/libnf.a} -%{?_with_adsrdd: %{_libdir}/%{name}/librddads.a} +%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a} +%{?_with_adsrdd: %{_libdir}/%{name}/libhbrddads.a} %{?_with_odbc: %{_libdir}/%{name}/libhbodbc.a} %{?_with_mysql: %{_libdir}/%{name}/libhbmysql.a} -%{?_with_pgsql: %{_libdir}/%{name}/libhbpg.a} -%{?_with_pgsql4: %{_libdir}/%{name}/libhbpg.a} +%{?_with_pgsql: %{_libdir}/%{name}/libhbpgsql.a} +%{?_with_pgsql4: %{_libdir}/%{name}/libhbpgsql.a} %{?_with_gd: %{_libdir}/%{name}/libhbgd.a} %{_libdir}/%{name}/libhbbtree.a -%{_libdir}/%{name}/libhtml.a %{_libdir}/%{name}/libhbmisc.a -%{_libdir}/%{name}/libct.a -%{_libdir}/%{name}/libtip.a +%{_libdir}/%{name}/libhbct.a +%{_libdir}/%{name}/libhbtip.a %{_libdir}/%{name}/libxhb.a +%{_libdir}/%{name}/libhbgt.a +%{_libdir}/%{name}/libhbbmcdx.a +%{_libdir}/%{name}/libhbclipsm.a %files lib %defattr(755,root,root,755) diff --git a/harbour/source/rtl/mouse53.c b/harbour/source/rtl/mouse53.c index 5515cec878..15105cf5e0 100644 --- a/harbour/source/rtl/mouse53.c +++ b/harbour/source/rtl/mouse53.c @@ -51,8 +51,7 @@ */ #include "hbapi.h" -#include "hbapiitm.h" -#include "hbgtcore.h" +#include "hbapigt.h" /* HARBOUR callable interface */