Author: qboosh Date: Sun Feb 27 00:46:52 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - some cleanups (incl. new-style bconds, internal dep fixes, subshells killing)
---- Files affected: SPECS: xharbour.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/xharbour.spec diff -u SPECS/xharbour.spec:1.5 SPECS/xharbour.spec:1.6 --- SPECS/xharbour.spec:1.5 Sat Feb 26 23:40:13 2005 +++ SPECS/xharbour.spec Sun Feb 27 01:46:46 2005 @@ -1,41 +1,39 @@ # $Revision$, $Date$ # # Conditional build: -# --with static - link all binaries with static libs -# --with adsrdd - build ads RDD -# --with mysql - build mysql lib -# --with pgsql - build pgsql lib -# --with odbc - build build odbc lib -# --with hrbsh - build /etc/profile.d/harb.sh (not necessary) -# --without x11 - do not build GTXVT and GTXWC -# --without gpm - build GTSLN and GTCRS without GPM support -# --without gtsln - do not build GTSLN -# --without nf - do not build nanforum lib doesn't work now. -###################################################################### -###################################################################### +%bcond_with static # link all binaries with static libs +%bcond_with adsrdd # build ads RDD +%bcond_with mysql # build mysql lib +%bcond_with pgsql # build pgsql lib +%bcond_with odbc # build odbc lib +%bcond_with hrbsh # build /etc/profile.d/harb.sh (not necessary) +%bcond_without x11 # do not build GTXVT and GTXWC +%bcond_without gpm # build GTSLN and GTCRS without GPM support +%bcond_without gtsln # do not build GTSLN +%bcond_without nf # do not build nanforum lib doesn't work now # # TODO: # nf # pprun +# - fix pt_BR (utf-8 broken by 8-bit copy-paste?) # -Summary: Backwards compatible Clipper Language compiler and preprocessor. -Summary(pl): Zgodny wstecz kompilator clippera oraz preprocesor +Summary: Backwards compatible Clipper Language compiler and preprocessor +Summary(pl): Zgodny wstecz kompilator i preprocesor Clippera Name: xharbour Version: 0.99.3 Release: 0.1 Epoch: 0 License: GPL v2 -#Vendor: - Group: Development/Languages -#Icon: - Source0: http://files.xharbour.org/source/%{name}-%{version}.src.tar.gz # Source0-md5: 7e660044656df06d98589da25285fc20 Source1: http://files.xharbour.org/source/%{name}-%{version}.src.contrib.tar.gz -URL: http://www.xharbour.org +URL: http://www.xharbour.org/ +Requires: %{name}-lib = %{epoch}:%{version}-%{release} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -%{dname} is a CA-Clipper compatible compiler for multiple platforms. +xHarbour is a CA-Clipper compatible compiler for multiple platforms. This package includes a compiler, pre-processor, header files, virtual machine and documentation. @@ -43,101 +41,97 @@ to this RPM distribution. %description -l pl -%{dname} to kompatybilny z językiem CA-Clipper kompilator rozwijany na +xHarbour to kompatybilny z językiem CA-Clipper kompilator rozwijany na wielu różnych platformach. Ten pakiet zawiera kompilator, preprocesor, -zbiory nagłówkowe, wirtualną maszynę oraz dokumentację. +pliki nagłówkowe, wirtualną maszynę oraz dokumentację. %description -l pt_BR -%{dname} ~B um compilador Clipper compativel para multiplas +xHarbour ~B um compilador Clipper compativel para multiplas plataformas. Esse pacote contem um compilador, um pr~B-processador, arquivos de cabe~Galho uma maquina virtual e documenta~GĆo. %description -l ru -%{dname} - ÍÎĎÇĎĐĚÁÔĆĎŇÍĹÎÎŮĘ ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ +xHarbour - ÍÎĎÇĎĐĚÁÔĆĎŇÍĹÎÎŮĘ ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ËĎÍĐÉĚŃÔĎŇ, ĐŇĹĐŇĎĂĹÓÓĎŇ, ĆÁĘĚŮ ÚÁÇĎĚĎ×ËĎ×, ×ÉŇÔŐÁĚŘÎŐŔ ÍÁŰÉÎŐ É ÄĎËŐÍĹÎÔÁĂÉŔ. - %package lib -Summary: Shared runtime libaries for %{dname} compiler -Summary(pl): Dzielone bilioteki dla kompilatora %{dname} -Summary(ru): óĎ×ÍĹÓÔÎĎ ÉÓĐĎĚŘÚŐĹÍŮĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ %{dname} -Group: Development/Languages +Summary: Shared runtime libaries for xHarbour compiler +Summary(pl): Dzielone bilioteki dla kompilatora xHarbour +Summary(ru): óĎ×ÍĹÓÔÎĎ ÉÓĐĎĚŘÚŐĹÍŮĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ xHarbour +Group: Libraries +# XXX: should be autodetected Provides: lib%{name}.so lib%{name}mt.so %description lib -%{dname} is a Clipper compatible compiler. This package provides -%{dname} runtime shared libraries for programs linked dynamically. +xHarbour is a Clipper compatible compiler. This package provides +xHarbour runtime shared libraries for programs linked dynamically. %description lib -l pl -%{dname} to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet -udostępnia dzielone bilioteki kompilatora %{dname} dla programów +xHarbour to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet +udostępnia dzielone bilioteki kompilatora xHarbour dla programów konsolidowanych dynamicznie. %description lib -l pt_BR -%{dname} ~B um compilador compativel com o Clipper. Esse pacote -%{dname} provem as bibliotecas compartilhadas para programas linkados +xHarbour ~B um compilador compativel com o Clipper. Esse pacote +xHarbour provem as bibliotecas compartilhadas para programas linkados dinamicamente. %description lib -l ru -%{dname} - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ -ÓĎÄĹŇÖÉÔ ÓĎ×ÍĹÓÔÎĎ ÉÓĐĎĚŘÚŐĹÍŮĹ ÂÉÂĚÉĎÔĹËÉ %{dname}, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ +xHarbour - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ +ÓĎÄĹŇÖÉÔ ÓĎ×ÍĹÓÔÎĎ ÉÓĐĎĚŘÚŐĹÍŮĹ ÂÉÂĚÉĎÔĹËÉ xHarbour, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ ŇÁÂĎÔŮ ÄÉÎÁÍÉŢĹÓËÉ ÓËĎÍĐĎÎĎ×ÁÎÎŮČ ĐŇĎÇŇÁÍÍ. - %package static -Summary: Static runtime libaries for %{dname} compiler -Summary(pl): Statyczne bilioteki dla kompilatora %{dname} -Summary(ru): óÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ %{dname} +Summary: Static runtime libaries for xHarbour compiler +Summary(pl): Statyczne bilioteki dla kompilatora xHarbour +Summary(ru): óÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ xHarbour Group: Development/Languages -Requires: %{name} = %{version} +Requires: %{name} = %{epoch}:%{version}-%{release} %description static -%{dname} is a Clipper compatible compiler. This package provides -%{dname} static runtime libraries for static program linking. +xHarbour is a Clipper compatible compiler. This package provides +xHarbour static runtime libraries for static program linking. %description static -l pl -%{dname} to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet -udostępnia statyczne bilioteki dla kompilatora %{dname} niezbędne do +xHarbour to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet +udostępnia statyczne bilioteki dla kompilatora xHarbour niezbędne do statycznej konsolidacji programów. %description static -l pt_BR -%{dname} ~B um compilador compativel com o clippe. Esse pacote -%{dname} provem as bibliotecas de run time staticas para linkagem dos +xHarbour ~B um compilador compativel com o clippe. Esse pacote +xHarbour provem as bibliotecas de run time staticas para linkagem dos os programas %description static -l ru -%{dname} - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ -ÓĎÄĹŇÖÉÔ ÓÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ËĎÍĐÉĚŃÔĎŇÁ %{dname}, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ +xHarbour - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ +ÓĎÄĹŇÖÉÔ ÓÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ ËĎÍĐÉĚŃÔĎŇÁ xHarbour, ÎĹĎÂČĎÄÉÍŮĹ ÄĚŃ ÓÔÁÔÉŢĹÓËĎĘ ËĎÍĐĎÎĎ×ËÉ ĐŇĎÇŇÁÍÍ. - - %package contrib -Summary: Contrib runtime libaries for %{dname} compiler -Summary(pl): Bilioteki z drzewa contrib dla kompilatora %{dname} -Summary(pt_BR): Libs contrib para %{dname} -Summary(ru): âÉÂĚÉĎÔĹËÉ ÉÚ ÄĹŇĹ×Á contrib ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ %{dname} +Summary: Contrib runtime libaries for xHarbour compiler +Summary(pl): Bilioteki z drzewa contrib dla kompilatora xHarbour +Summary(pt_BR): Libs contrib para xHarbour +Summary(ru): âÉÂĚÉĎÔĹËÉ ÉÚ ÄĹŇĹ×Á contrib ÄĚŃ ËĎÍĐÉĚŃÔĎŇÁ xHarbour Group: Development/Languages -Requires: %{name} = %{version} +Requires: %{name} = %{epoch}:%{version}-%{release} %description contrib -%{dname} is a Clipper compatible compiler. This package provides -%{dname} contrib libraries for program linking. +xHarbour is a Clipper compatible compiler. This package provides +xHarbour contrib libraries for program linking. %description contrib -l pl -%{dname} to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet +xHarbour to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet udostępnia statyczne bilioteki z drzewa contrib dla kompilatora -%{dname}. +xHarbour. %description contrib -l pt_BR -%{dname} ~B um compilador compativel com o clippe. Esse pacote -%{dname} provem as bibliotecas contrib para linkagem dos programas. +xHarbour ~B um compilador compativel com o clippe. Esse pacote +xHarbour provem as bibliotecas contrib para linkagem dos programas. %description contrib -l ru -%{dname} - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ -ÓĎÄĹŇÖÉÔ ÓÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ %{dname} ÉÚ ÄĹŇĹ×Á contrib. - +xHarbour - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ +ÓĎÄĹŇÖÉÔ ÓÔÁÔÉŢĹÓËÉĹ ÂÉÂĚÉĎÔĹËÉ xHarbour ÉÚ ÄĹŇĹ×Á contrib. %package pp Summary: Clipper/Harbour/xBase compatible Pre-Processor, DOT prompt and interpreter @@ -145,11 +139,11 @@ Summary(ru): óĎ×ÍĹÓÔÉÍŮĘ Ó Clipper/Harbour/xBase ĐŇĹĐŇĎĂĹÓÓĎŇ É ÉÎÔĹŇĐŇĹÔÁÔĎŇ License: GPL Group: Development/Languages -Requires: %{name} = %{version} +Requires: %{name} = %{epoch}:%{version}-%{release} %description pp -%{dname} is a Clipper compatible compiler. This package provides -%{dname} PP. It has 3 personalities which are tied tightly together. +xHarbour is a Clipper compatible compiler. This package provides +xHarbour PP. It has 3 personalities which are tied tightly together. 1. What is supposed to be 100% Clipper compatible Pre-Processor (with some extensions). 2. DOT prompt, which suppose to allow most of Clipper syntax. 3. Finally, PP is a limited Clipper/Harbour/xBase @@ -158,18 +152,18 @@ your .prg files #!/usr/bin/pprun %description pp -l pl -%{dname} to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet -udostępnia %{dname} PP, który daje trzy narzędzia w jednym. 1. W 100% +xHarbour to kompatybilny z językiem CA-Clipper kompilator. Ten pakiet +udostępnia xHarbour PP, który daje trzy narzędzia w jednym. 1. W 100% kompatybilny z Clipperem preprocesor (z pewnymi rozeszerzeniami) 2. Środowisko DOT, w którym można używać większości składni Clippera 3. PP to także nieco ograniczony interpreter Clippera. Z uwzględnieniem wspomnianych kilku ograniczeń potrafi on uruchomić większość składni -Harbour. Możesz napisać swój własny skrypt xBase dodając do pliku .prg -#!/usr/bin/pprun +Harbour. Można napisać swój własny skrypt xBase dodając +"#!/usr/bin/pprun" do pliku .prg. %description pp -l pt_BR -%{dname} ~B um compilador Clipper compativel. Esse pacote provem o -%{dname} PP. Ele tem 3 caracteristicas dependentes uma da outra. 1. +xHarbour ~B um compilador Clipper compativel. Esse pacote provem o +xHarbour PP. Ele tem 3 caracteristicas dependentes uma da outra. 1. Que e supostamente ser um Pre-Processor 100% compativel com o Clipper (com algumas extenssäes). 2. DOT prompt, que supostamente permite a maioria das syntaxes do Clipper. 3. Finalmente, PP ~B um limitado @@ -179,8 +173,8 @@ #!/usr/bin/pprun %description pp -l ru -%{dname} - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ -ÓĎÄĹŇÖÉÔ ĐŇĹĐŇĎĂĹÓÓĎŇ %{dname}, ËĎÔĎŇŮĘ ÓĎÓÔĎÉÔ ÉÚ ÔŇĹČ ÔĹÓÎĎ +xHarbour - ËĎÍĐÉĚŃÔĎŇ, ÓĎ×ÍĹÓÔÉÍŮĘ Ó ŃÚŮËĎÍ CA-Clipper. üÔĎÔ ĐÁËĹÔ +ÓĎÄĹŇÖÉÔ ĐŇĹĐŇĎĂĹÓÓĎŇ xHarbour, ËĎÔĎŇŮĘ ÓĎÓÔĎÉÔ ÉÚ ÔŇĹČ ÔĹÓÎĎ Ó×ŃÚÁÎÎŮČ ŢÁÓÔĹĘ. 1. 100%-ÓĎ×ÍĹÓÔÉÍŮĘ Ó Clipper ĐŇĹĐŇĎĂĹÓÓĎŇ (Ó ÎĹËĎÔĎŇŮÍÉ ŇÁÓŰÉŇĹÎÉŃÍÉ). 2. DOT Prompt, × ËĎÔĎŇĎÍ ÍĎÖÎĎ ÉÓĐĎĚŘÚĎ×ÁÔŘ ÂĎĚŘŰÉÎÓÔ×Ď ËĎÎÓÔŇŐËĂÉĘ Clipper. 3. ëŇĎÍĹ ÔĎÇĎ, PP - ĎÇŇÁÎÉŢĹÎÎŮĘ @@ -193,39 +187,27 @@ %setup -q -b 1 %build -# if ac/am/* rebuilding is necessary, do it in this order and add -# appropriate BuildRequires -#%%{__gettextize} -#%%{__aclocal} -#%%{__autoconf} -#%%{__autoheader} -#%%{__automake} - - -###################################################################### - %if "%{platform}" == "" %define platform %([ -f %{_sysconfdir}/pld-release ] && cat %{_sysconfdir}/pld-release|sed -e '/1/ !d' -e 's/[^0-9]//g' -e 's/^/pld/') %endif -%define prefix %{_prefix} %define hb_pref xhb %define hb_arch export HB_ARCHITECTURE=linux %define hb_cc export HB_COMPILER=gcc %define hb_cflag export C_USR="-DHB_FM_STATISTICS_OFF -O3" -%define hb_lflag export L_USR=%{?_with_static:-static} +%define hb_lflag export L_USR=%{?with_static:-static} %define hb_mt export HB_MT=MT %define hb_mgt export HB_MULTI_GT=yes %define hb_gt export HB_GT_LIB=gtcrs -%define hb_gpm export HB_GPM_MOUSE=%{!?_without_gpm:yes} -%define hb_sln export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes} -%define hb_x11 export HB_WITHOUT_X11=%{?_without_x11:yes} +%define hb_gpm export HB_GPM_MOUSE=%{?with_gpm:yes} +%define hb_sln export HB_WITHOUT_GTSLN=%{!?with_gtsln:yes} +%define hb_x11 export HB_WITHOUT_X11=%{!?with_x11:yes} %define hb_bdir export HB_BIN_INSTALL=%{_bindir} %define hb_idir export HB_INC_INSTALL=%{_includedir}/%{name} -%define hb_ldir export HB_LIB_INSTALL=%{_prefix}/lib/%{name} -%define hb_opt export HB_GTALLEG=%{?_with_allegro:yes} +%define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} +%define hb_opt export HB_GTALLEG=%{?with_allegro:yes} %define hb_cmrc export HB_COMMERCE=no -%define hb_ctrb %{!?_without_nf:libnf} %{?_with_adsrdd:rdd_ads} %{?_with_mysql:mysql} %{?_with_pgsql:pgsql} +%define hb_ctrb %{?with_nf:libnf} %{?with_adsrdd:rdd_ads} %{?with_mysql:mysql} %{?with_pgsql:pgsql} %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_gpm} ; %{hb_sln} ; %{hb_x11} ; %{hb_mgt} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_opt} ; %{hb_cmrc} %define hb_host www.xharbour.org @@ -236,10 +218,10 @@ %{__make} # build contrib libraries -for l in %{hb_ctrb} -do - (cd "contrib/$l" - %{__make} ) +for l in %{hb_ctrb} ; do + cd "contrib/$l" + %{__make} + cd ../.. done %install @@ -257,15 +239,14 @@ install -d $HB_INC_INSTALL install -d $HB_LIB_INSTALL - #./contrib/pgsql/linux/gcc/libhbpg.a for l in %{hb_ctrb} do - (cd "contrib/$l" - %{__make} install ) + cd "contrib/$l" + %{__make} install + cd ../.. done - %clean rm -rf $RPM_BUILD_ROOT @@ -280,11 +261,10 @@ %doc doc/es/ #%dir /etc/harbour -#%verify(not md5 mtime) %config /etc/harbour.cfg -#%verify(not md5 mtime) %config /etc/harbour/hb-charmap.def -%{?_with_hrbsh:/etc/profile.d/harb.sh} +#%verify(not md5 mtime size) %config(noreplace) /etc/harbour.cfg +#%verify(not md5 mtime size) %config(noreplace) /etc/harbour/hb-charmap.def +%{?with_hrbsh:/etc/profile.d/harb.sh} -%attr(755,root,root) %attr(755,root,root) %{_bindir}/harbour %attr(755,root,root) %{_bindir}/hb-mkslib %attr(755,root,root) %{_bindir}/%{hb_pref}-build @@ -309,47 +289,45 @@ %files static %defattr(644,root,root,755) -%dir %{_prefix}/lib/%{name} -%{_prefix}/lib/%{name}/libcodepage.a -%{_prefix}/lib/%{name}/libcommon.a -%{_prefix}/lib/%{name}/libdb*.a -%{_prefix}/lib/%{name}/libdebug.a -%{_prefix}/lib/%{name}/libfm*.a -%{_prefix}/lib/%{name}/libgt*.a -%{_prefix}/lib/%{name}/libhbtip*.a -%{?_with_odbc: %{_prefix}/lib/%{name}/libhbodbc.a} -%{_prefix}/lib/%{name}/libhbct*.a -%{_prefix}/lib/%{name}/liblang.a -%{_prefix}/lib/%{name}/libmacro*.a -%{_prefix}/lib/%{name}/libnulsys*.a -%{_prefix}/lib/%{name}/libpp*.a -%{_prefix}/lib/%{name}/librdd*.a -%{_prefix}/lib/%{name}/librtl*.a -%{_prefix}/lib/%{name}/libsamples.a -%{_prefix}/lib/%{name}/libvm*.a -%{_prefix}/lib/%{name}/libmain*.a -%{_prefix}/lib/%{name}/libopt*.a +%{_libdir}/%{name}/libcodepage.a +%{_libdir}/%{name}/libcommon.a +%{_libdir}/%{name}/libdb*.a +%{_libdir}/%{name}/libdebug.a +%{_libdir}/%{name}/libfm*.a +%{_libdir}/%{name}/libgt*.a +%{_libdir}/%{name}/libhbtip*.a +%{?with_odbc:%{_libdir}/%{name}/libhbodbc.a} +%{_libdir}/%{name}/libhbct*.a +%{_libdir}/%{name}/liblang.a +%{_libdir}/%{name}/libmacro*.a +%{_libdir}/%{name}/libnulsys*.a +%{_libdir}/%{name}/libpp*.a +%{_libdir}/%{name}/librdd*.a +%{_libdir}/%{name}/librtl*.a +%{_libdir}/%{name}/libsamples.a +%{_libdir}/%{name}/libvm*.a +%{_libdir}/%{name}/libmain*.a +%{_libdir}/%{name}/libopt*.a %files contrib %defattr(644,root,root,755) -%dir %{_prefix}/lib/%{name} -%{!?_without_nf: %{_prefix}/lib/%{name}/libnf*.a} -%{?_with_adsrdd: %{_prefix}/lib/%{name}/librddads*.a} -%{?_with_mysql: %{_prefix}/lib/%{name}/libmysql*.a} -%{?_with_pgsql: %{_prefix}/lib/%{name}/libhbpg*.a} +%{?with_nf:%{_libdir}/%{name}/libnf*.a} +%{?with_adsrdd:%{_libdir}/%{name}/librddads*.a} +%{?with_mysql:%{_libdir}/%{name}/libmysql*.a} +%{?with_pgsql:%{_libdir}/%{name}/libhbpg*.a} %files lib %defattr(644,root,root,755) -%dir %{_prefix}/lib/%{name} -%{_prefix}/lib/%{name}/*.so -%{_prefix}/lib/*.so +%dir %{_libdir}/%{name} +%attr(755,root,root) %{_libdir}/%{name}/*.so +%attr(755,root,root) %{_libdir}/*.so %files pp %defattr(644,root,root,755) %doc utils/xbscript/xbscript.txt %attr(755,root,root) %{_bindir}/xbscript -#%{prefix}/bin/pprun -#%{prefix}/bin/xprompt +#%{_bindir}/pprun +#%{_bindir}/xprompt %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -357,6 +335,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2005/02/27 00:46:46 qboosh +- some cleanups (incl. new-style bconds, internal dep fixes, subshells killing) + Revision 1.5 2005/02/26 22:40:13 hunter -adapterized -some permisions fixups @@ -374,4 +355,3 @@ Revision 1.1 2005/02/25 18:29:32 hunter -commit just for getting sources into df -one-big-NYF - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/xharbour.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
