fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* harbour.spec
  * harbour-win-spec
  * harbour-wce-spec
  * mpkg_rpm.sh
  * mpkg_rpm_win.sh
  * mpkg_rpm_wce.sh
    % Deleted special logic to disable hbnf lib.
This commit is contained in:
Viktor Szakats
2009-11-29 12:50:31 +00:00
parent 9b6158c608
commit 72754b660b
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -17,6 +17,15 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-29 13:49 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
% Deleted special logic to disable hbnf lib.
2009-11-29 13:46 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/mpkg_rpm.sh
! check if QT4 is in version 4.5 or newer

2
harbour/harbour-wce-spec
View File

@@ -17,7 +17,6 @@
# --with allegro - build gtalleg - Allegro based GT driver
# --with ads - build rddads
# --with odbc - build odbc lib
# --without hbnf - do not build hbnf lib (nanforum lib)
######################################################################
######################################################################
@@ -139,7 +138,6 @@ 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_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe

2
harbour/harbour-win-spec
View File

@@ -17,7 +17,6 @@
# --with allegro - build gtalleg - Allegro based GT driver
# --with ads - build rddads
# --with odbc - build odbc lib
# --without hbnf - do not build hbnf lib (nanforum lib)
######################################################################
######################################################################
@@ -139,7 +138,6 @@ 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_hbnf:1}" ] && rm -f $HB_LIB_INSTALL/libhbnf.a
# remove unused files
rm -fR ${HB_BIN_INSTALL}/{harbour,hbpp,hbmk2,hbrun,hbi18n,hbtest}.exe

4
harbour/harbour.spec
View File

@@ -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_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_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnetio hbtip hbtpathy hbhpdf hbsms hbziparc xhb rddsql 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
@@ -622,7 +622,7 @@ rm -rf $RPM_BUILD_ROOT
%files contrib
%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
%{!?_without_hbnf: %{_libdir}/%{name}/libhbnf.a}
%{_libdir}/%{name}/libhbnf.a
%{_libdir}/%{name}/libhbbtree.a
%{_libdir}/%{name}/libhbmisc.a
%{_libdir}/%{name}/libhbmzip.a

1
harbour/mpkg_rpm.sh
View File

@@ -25,7 +25,6 @@
# --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 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

1
harbour/mpkg_rpm_wce.sh
View File

@@ -19,7 +19,6 @@
# --with allegro - build GTALLEG - Allegro based GT driver
# --with ads - build ADS RDD
# --without odbc - do not build odbc lib
# --without hbnf - do not build hbnf lib (nanforum lib)
######################################################################
test_reqrpm()

1
harbour/mpkg_rpm_win.sh
View File

@@ -19,7 +19,6 @@
# --with allegro - build GTALLEG - Allegro based GT driver
# --with ads - build ADS RDD
# --without odbc - do not build odbc lib
# --without hbnf - do not build hbnf lib (nanforum lib)
######################################################################
test_reqrpm()