Author: djrzulf Date: Tue Mar 1 16:01:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - h323 back, but doesn't compile,
---- Files affected: SPECS: asterisk.spec (1.38 -> 1.39) ---- Diffs: ================================================================ Index: SPECS/asterisk.spec diff -u SPECS/asterisk.spec:1.38 SPECS/asterisk.spec:1.39 --- SPECS/asterisk.spec:1.38 Tue Mar 1 06:56:04 2005 +++ SPECS/asterisk.spec Tue Mar 1 17:01:44 2005 @@ -41,16 +41,17 @@ BuildRequires: speex-devel BuildRequires: zaptel-devel BuildRequires: zlib-devel +#BuildRequires: mpg123 # These libraries are crazy... # With openh323 1.11.7 and pwlib 1.4.11 i had sig11 #BuildRequires: openh323-devel = 1.10.4 #BuildRequires: pwlib-devel = 1.4.4 -%{?with_h323:BuildRequires: openh323-devel} -%{?with_h323:BuildRequires: pwlib-devel} +%{!?without_h323:BuildRequires: openh323-devel} +%{!?without_h323:BuildRequires: pwlib-devel} PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig -%{?with_h323:%requires_eq openh323} -%{?with_h323:%requires_eq pwlib} +%{?without_h323:%requires_eq openh323} +%{?without_h323:%requires_eq pwlib} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -118,14 +119,14 @@ CC="%{__cc}" \ OPTIMIZE="%{rpmcflags}" -%if %{with h323} +%if %{!without h323} # H323 plugin: cd channels/h323/ %{__make} \ PWLIBDIR="%{_prefix}" \ OPENH323DIR="%{_prefix}" \ CC="%{__cc}" \ - OPTIMIZE="%{rpmcflags}" + CFLAGS="%{rpmcflags} -I/usr/include/openh323 -fPIC -fpic" cd ../../ %endif @@ -228,6 +229,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2005/03/01 16:01:44 djrzulf +- h323 back, but doesn't compile, + Revision 1.38 2005/03/01 05:56:04 djrzulf - updated to 1.0.6, stbr AC-TEST, ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/asterisk.spec?r1=1.38&r2=1.39&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit