2009-11-29 10:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* harbour.spec
* harbour-win-spec
* harbour-wce-spec
* mpkg_rpm.sh
* mpkg_rpm_win.sh
* mpkg_rpm_wce.sh
* Cleanup/sync of 'with' and 'without' parameters:
--with fbsql -> --with firebird
--without nf -> --without hbnf
--without gtcrs -> --without curses
--without gtsln -> --without slang
! Deleted fmstat/nofmstat options from help texts.
* Internal 'fbird' references changed to 'firebird'.
; Pls test.
; TODO: I'd like to delete '--without hbnf'. If someone knows
why this lib is different than all the others so that
it needs special --without switch, pls speak up.
This commit is contained in:
Viktor Szakats
@@ -17,11 +17,31 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2009-11-29 10:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* harbour.spec
|
||||
* harbour-win-spec
|
||||
* harbour-wce-spec
|
||||
* mpkg_rpm.sh
|
||||
* mpkg_rpm_win.sh
|
||||
* mpkg_rpm_wce.sh
|
||||
* Cleanup/sync of 'with' and 'without' parameters:
|
||||
--with fbsql -> --with firebird
|
||||
--without nf -> --without hbnf
|
||||
--without gtcrs -> --without curses
|
||||
--without gtsln -> --without slang
|
||||
! Deleted fmstat/nofmstat options from help texts.
|
||||
* Internal 'fbird' references changed to 'firebird'.
|
||||
; Pls test.
|
||||
|
||||
; TODO: I'd like to delete '--without hbnf'. If someone knows
|
||||
why this lib is different than all the others so that
|
||||
it needs special --without switch, pls speak up.
|
||||
|
||||
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.
|
||||
Patch submitted by Tomaz Zupan. Thanks.
|
||||
! Converted tab to space.
|
||||
|
||||
2009-11-29 07:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
# --with mysql - build mysql lib
|
||||
# --with pgsql - build pgsql lib
|
||||
# --with gd - build gd lib
|
||||
# --with allegro - build GTALLEG - Allegro based GT driver
|
||||
# --with ads - build ADS RDD
|
||||
# --with allegro - build gtalleg - Allegro based GT driver
|
||||
# --with ads - build rddads
|
||||
# --with odbc - build odbc lib
|
||||
# --without nf - do not build nanforum lib
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
######################################################################
|
||||
|
||||
######################################################################
|
||||
@@ -139,7 +139,7 @@ make install %{?_smp_mflags}
|
||||
[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a
|
||||
[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
|
||||
[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
|
||||
[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
|
||||
[ "%{?_without_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
|
||||
|
||||
# remove unused files
|
||||
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe
|
||||
@@ -180,8 +180,6 @@ All these scripts accept command line switches:
|
||||
-hwgui # link with HWGUI library (GTK+ interface)
|
||||
-l<libname> # link with <libname> library
|
||||
-L<libpath> # additional path to search for libraries
|
||||
-fmstat # link with the memory statistics lib
|
||||
-nofmstat # do not link with the memory statistics lib (default)
|
||||
-[no]strip # strip (no strip) binaries
|
||||
-main=<main_func> # set the name of main program function/procedure.
|
||||
# if not set then 'MAIN' is used or if it doesn't
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
# --with mysql - build mysql lib
|
||||
# --with pgsql - build pgsql lib
|
||||
# --with gd - build gd lib
|
||||
# --with allegro - build GTALLEG - Allegro based GT driver
|
||||
# --with ads - build ADS RDD
|
||||
# --with allegro - build gtalleg - Allegro based GT driver
|
||||
# --with ads - build rddads
|
||||
# --with odbc - build odbc lib
|
||||
# --without nf - do not build nanforum lib
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
######################################################################
|
||||
|
||||
######################################################################
|
||||
@@ -139,7 +139,7 @@ make install %{?_smp_mflags}
|
||||
[ "%{?_with_odbc:1}" ] || rm -f $HB_LIB_INSTALL/libhbodbc.a
|
||||
[ "%{?_with_allegro:1}" ] || rm -f $HB_LIB_INSTALL/libgtalleg.a
|
||||
[ "%{?_with_ads:1}" ] || rm -f $HB_LIB_INSTALL/librddads.a
|
||||
[ "%{?_without_nf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
|
||||
[ "%{?_without_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
|
||||
|
||||
# remove unused files
|
||||
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe
|
||||
@@ -180,8 +180,6 @@ All these scripts accept command line switches:
|
||||
-hwgui # link with HWGUI library (GTK+ interface)
|
||||
-l<libname> # link with <libname> library
|
||||
-L<libpath> # additional path to search for libraries
|
||||
-fmstat # link with the memory statistics lib
|
||||
-nofmstat # do not link with the memory statistics lib (default)
|
||||
-[no]strip # strip (no strip) binaries
|
||||
-main=<main_func> # set the name of main program function/procedure.
|
||||
# if not set then 'MAIN' is used or if it doesn't
|
||||
|
||||
@@ -15,20 +15,20 @@
|
||||
# --with static - link all binaries with static libs
|
||||
# --with mysql - build hbmysql lib and sddmy for sqlrdd
|
||||
# --with pgsql - build hbpgsql lib and sddpg for sqlrdd
|
||||
# --with fbsql - build hbfbird lib and sddfb for sqlrdd
|
||||
# --with firebird - build hbfbird lib and sddfb for sqlrdd
|
||||
# --with odbc - build hbodbc lib and sddodbc for sqlrdd
|
||||
# --with gd - build hbgd lib
|
||||
# --with ads - build rddads RDD
|
||||
# --with ads - build rddads
|
||||
# --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
|
||||
# --without gpm - build GTTRM, GTSLN and GTCRS without GPM support
|
||||
# --without gtcrs - do not build GTCRS
|
||||
# --without gtsln - do not build GTSLN
|
||||
# --with qt - build hbqt and hbxbp libs
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
# --without gpllib - do not build libs which needs GPL 3rd party code
|
||||
# --without x11 - do not build gtxwc
|
||||
# --without gpm - build gttrm, gtsln and gtcrs without gpm support
|
||||
# --without curses - do not build gtcrs
|
||||
# --without slang - do not build gtsln
|
||||
######################################################################
|
||||
|
||||
######################################################################
|
||||
@@ -76,8 +76,8 @@
|
||||
%define hb_cflag export HB_USER_CFLAGS=
|
||||
%define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}"
|
||||
%define hb_gpm export HB_WITH_GPM=%{!?_without_gpm:yes}%{?_without_gpm:no}
|
||||
%define hb_crs export HB_WITH_CURSES=%{!?_without_gtcrs:yes}%{?_without_gtcrs:no}
|
||||
%define hb_sln export HB_WITH_SLANG=%{!?_without_gtsln:yes}%{?_without_gtsln:no}
|
||||
%define hb_crs export HB_WITH_CURSES=%{!?_without_curses:yes}%{?_without_curses:no}
|
||||
%define hb_sln export HB_WITH_SLANG=%{!?_without_slang:yes}%{?_without_slang:no}
|
||||
%define hb_x11 export HB_WITH_X11=%{!?_without_x11:yes}%{?_without_x11:no}
|
||||
%define hb_local export HB_WITH_ZLIB=%{?_with_localzlib:local} ; export HB_WITH_PCRE=%{?_with_localpcre:local}
|
||||
%define hb_bdir export HB_BIN_INSTALL=%{_bindir}
|
||||
@@ -85,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} %{?_with_qt:hbqt hbxbp}"
|
||||
%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql %{!?_without_hbnf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_firebird: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
|
||||
@@ -106,7 +106,7 @@ Vendor: %{hb_host}
|
||||
URL: http://%{hb_host}/
|
||||
Source: %{name}-%{version}.src.tar.gz
|
||||
Packager: Przemys³aw Czerpak <druzus@polbox.com> Luiz Rafael Culik Guimaraes <culikr@uol.com.br>
|
||||
BuildPrereq: gcc binutils bash %{!?_without_gtcrs: ncurses-devel} %{!?_without_gpm: gpm-devel}
|
||||
BuildPrereq: gcc binutils bash %{!?_without_curses: ncurses-devel} %{!?_without_gpm: gpm-devel}
|
||||
Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Provides: %{name} harbour
|
||||
BuildRoot: /tmp/%{name}-%{version}-root
|
||||
@@ -323,20 +323,20 @@ statikus szerkeszt
|
||||
%{?_with_pgsql:%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.}
|
||||
%{?_with_pgsql:Ten pakiet udostêpnia statyczn+ biliotekê PGSQL dla kompilatora %{dname}.}
|
||||
|
||||
## fbird library
|
||||
%{?_with_fbsql:%package fbird}
|
||||
%{?_with_fbsql:Summary: FireBird libarary for %{dname} compiler}
|
||||
%{?_with_fbsql:Summary(pl): Bilioteka FireBird dla kompilatora %{dname}}
|
||||
%{?_with_fbsql:Group: Development/Languages}
|
||||
%{?_with_fbsql:Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}}
|
||||
## firebird library
|
||||
%{?_with_firebird:%package firebird}
|
||||
%{?_with_firebird:Summary: FireBird libarary for %{dname} compiler}
|
||||
%{?_with_firebird:Summary(pl): Bilioteka FireBird dla kompilatora %{dname}}
|
||||
%{?_with_firebird:Group: Development/Languages}
|
||||
%{?_with_firebird:Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}}
|
||||
|
||||
%{?_with_fbsql:%description fbird}
|
||||
%{?_with_fbsql:%{dname} is a Clipper compatible compiler.}
|
||||
%{?_with_fbsql:This package provides %{dname} FireBird library for program linking.}
|
||||
%{?_with_firebird:%description firebird}
|
||||
%{?_with_firebird:%{dname} is a Clipper compatible compiler.}
|
||||
%{?_with_firebird:This package provides %{dname} FireBird library for program linking.}
|
||||
|
||||
%{?_with_fbsql:%description -l pl fbird}
|
||||
%{?_with_fbsql:%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.}
|
||||
%{?_with_fbsql:Ten pakiet udostêpnia statyczn+ biliotekê FireBird dla kompilatora %{dname}.}
|
||||
%{?_with_firebird:%description -l pl firebird}
|
||||
%{?_with_firebird:%{dname} to kompatybilny z jêzykiem CA-Cl*pper kompilator.}
|
||||
%{?_with_firebird:Ten pakiet udostêpnia statyczn+ biliotekê FireBird dla kompilatora %{dname}.}
|
||||
|
||||
## gd library
|
||||
%{?_with_gd:%package gd}
|
||||
@@ -403,8 +403,8 @@ export LD_LIBRARY_PATH=$HB_INST_PKGPREF$HB_LIB_INSTALL
|
||||
make install %{?_smp_mflags}
|
||||
|
||||
[ "%{?_with_allegro:1}" ] || rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libgtalleg.a
|
||||
[ "%{?_without_gtcrs:1}" ] && rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libgtcrs.a
|
||||
[ "%{?_without_gtsln:1}" ] && rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libgtsln.a
|
||||
[ "%{?_without_curses:1}" ] && rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libgtcrs.a
|
||||
[ "%{?_without_slang:1}" ] && rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libgtsln.a
|
||||
rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/liblibhpdf.a
|
||||
rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/liblibpng.a
|
||||
rm -f $HB_INST_PKGPREF$HB_LIB_INSTALL/libsqlite3.a
|
||||
@@ -460,8 +460,6 @@ All these scripts accept command line switches:
|
||||
-hwgui # link with HWGUI library (GTK+ interface)
|
||||
-l<libname> # link with <libname> library
|
||||
-L<libpath> # additional path to search for libraries
|
||||
-fmstat # link with the memory statistics lib
|
||||
-nofmstat # do not link with the memory statistics lib (default)
|
||||
-[no]strip # strip (no strip) binaries
|
||||
-main=<main_func> # set the name of main program function/procedure.
|
||||
# if not set then 'MAIN' is used or if it doesn't
|
||||
@@ -624,7 +622,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files contrib
|
||||
%defattr(644,root,root,755)
|
||||
%dir %{_libdir}/%{name}
|
||||
%{!?_without_nf: %{_libdir}/%{name}/libhbnf.a}
|
||||
%{!?_without_hbnf: %{_libdir}/%{name}/libhbnf.a}
|
||||
%{_libdir}/%{name}/libhbbtree.a
|
||||
%{_libdir}/%{name}/libhbmisc.a
|
||||
%{_libdir}/%{name}/libhbmzip.a
|
||||
@@ -675,11 +673,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{?_with_pgsql:%{_libdir}/%{name}/libhbpgsql.a}
|
||||
%{?_with_pgsql:%{_libdir}/%{name}/libsddpg.a}
|
||||
|
||||
%{?_with_fbsql:%files fbird}
|
||||
%{?_with_fbsql:%defattr(644,root,root,755)}
|
||||
%{?_with_fbsql:%dir %{_libdir}/%{name}}
|
||||
%{?_with_fbsql:%{_libdir}/%{name}/libhbfbird.a}
|
||||
%{?_with_fbsql:%{_libdir}/%{name}/libsddfb.a}
|
||||
%{?_with_firebird:%files firebird}
|
||||
%{?_with_firebird:%defattr(644,root,root,755)}
|
||||
%{?_with_firebird:%dir %{_libdir}/%{name}}
|
||||
%{?_with_firebird:%{_libdir}/%{name}/libhbfbird.a}
|
||||
%{?_with_firebird:%{_libdir}/%{name}/libsddfb.a}
|
||||
|
||||
%{?_with_gd:%files gd}
|
||||
%{?_with_gd:%defattr(644,root,root,755)}
|
||||
|
||||
@@ -16,20 +16,20 @@
|
||||
# --with static - link all binaries with static libs
|
||||
# --with mysql - build hbmysql lib and sddmy for sqlrdd
|
||||
# --with pgsql - build hbpgsql lib and sddpg for sqlrdd
|
||||
# --with fbsql - build hbfbird lib and sddfb for sqlrdd
|
||||
# --with firebird - build hbfbird lib and sddfb for sqlrdd
|
||||
# --with odbc - build hbodbc lib and sddodbc for sqlrdd
|
||||
# --with ads - build rddads RDD
|
||||
# --with ads - build rddads
|
||||
# --with gd - build hbgd lib
|
||||
# --with qt - build hbqt and hbxbp
|
||||
# --with allegro - build GTALLEG - Allegro based GT driver
|
||||
# --with qt - build hbqt and hbxbp libs
|
||||
# --with allegro - build gtalleg - Allegro based GT driver
|
||||
# --with localzlib - build local copy of zlib library
|
||||
# --with localpcre - build local copy of pcre library
|
||||
# --without gpllib - do not build libs which needs GPL 3-rd party code
|
||||
# --without nf - do not build hbnf lib (nanforum lib)
|
||||
# --without x11 - do not build GTXWC
|
||||
# --without gpm - build GTTRM, GTSLN and GTCRS without GPM support
|
||||
# --without gtcrs - do not build GTCRS
|
||||
# --without gtsln - do not build GTSLN
|
||||
# --without gpllib - do not build libs which needs GPL 3rd party code
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
# --without x11 - do not build gtxwc
|
||||
# --without gpm - build gttrm, gtsln and gtcrs without gpm support
|
||||
# --without curses - do not build gtcrs
|
||||
# --without slang - do not build gtsln
|
||||
######################################################################
|
||||
|
||||
test_reqrpm()
|
||||
@@ -85,7 +85,7 @@ do
|
||||
[ "$1" = "odbc" ] && NEED_RPM="${NEED_RPM} unixODBC-devel"
|
||||
fi
|
||||
[ "$1" = "pgsql" ] && NEED_RPM="${NEED_RPM} postgresql-devel"
|
||||
[ "$1" = "fbsql" ] && NEED_RPM="${NEED_RPM} firebird-devel"
|
||||
[ "$1" = "firebird" ] && NEED_RPM="${NEED_RPM} firebird-devel"
|
||||
[ "$1" = "allegro" ] && NEED_RPM="${NEED_RPM} allegro-devel"
|
||||
[ "$1" = "qt" ] && NEED_RPM="${NEED_RPM} libqt4-devel"
|
||||
fi
|
||||
@@ -104,7 +104,7 @@ then
|
||||
fi
|
||||
if test_reqrpm "firebird-devel"
|
||||
then
|
||||
INST_PARAM="${INST_PARAM} --with fbsql"
|
||||
INST_PARAM="${INST_PARAM} --with firebird"
|
||||
fi
|
||||
if test_reqrpm "gd-devel"
|
||||
then
|
||||
@@ -145,11 +145,11 @@ then
|
||||
fi
|
||||
if ! test_reqrpm ncurses || ! test_reqrpm ncurses-devel
|
||||
then
|
||||
INST_PARAM="${INST_PARAM} --without gtcrs"
|
||||
INST_PARAM="${INST_PARAM} --without curses"
|
||||
fi
|
||||
if ! test_reqrpm slang || ! test_reqrpm slang-devel
|
||||
then
|
||||
INST_PARAM="${INST_PARAM} --without gtsln"
|
||||
INST_PARAM="${INST_PARAM} --without slang"
|
||||
fi
|
||||
if [ ! -f /usr/include/zlib.h ] && [ ! -f /usr/local/include/zlib.h ]
|
||||
then
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# --with allegro - build GTALLEG - Allegro based GT driver
|
||||
# --with ads - build ADS RDD
|
||||
# --without odbc - do not build odbc lib
|
||||
# --without nf - do not build nanforum lib
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
######################################################################
|
||||
|
||||
test_reqrpm()
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
# --with allegro - build GTALLEG - Allegro based GT driver
|
||||
# --with ads - build ADS RDD
|
||||
# --without odbc - do not build odbc lib
|
||||
# --without nf - do not build nanforum lib
|
||||
# --without hbnf - do not build hbnf lib (nanforum lib)
|
||||
######################################################################
|
||||
|
||||
test_reqrpm()
|
||||
|
||||
Reference in New Issue
Block a user