Author: mmazur Date: Fri Feb 19 09:28:29 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3 - added bcond sip_fax_only - added missing *.mak files required for building by latest t38modem (ver 1.2)
---- Files affected: packages/opal: opal.spec (1.48 -> 1.49) ---- Diffs: ================================================================ Index: packages/opal/opal.spec diff -u packages/opal/opal.spec:1.48 packages/opal/opal.spec:1.49 --- packages/opal/opal.spec:1.48 Sat Jan 9 17:42:29 2010 +++ packages/opal/opal.spec Fri Feb 19 10:28:23 2010 @@ -7,6 +7,9 @@ # MPEG4 rate control correction requires libavcodec sources # CAPI support # +# Conditional build: +%bcond_with sip_fax_only # Minimal build for t38modem + SIP +# # Don't touch this! strip removes all symbols from library %define no_install_post_strip 1 # @@ -14,7 +17,7 @@ Summary(pl.UTF-8): Biblioteka Open Phone Abstraction Library (aka OpenH323 v2) Name: opal Version: 3.6.6 -Release: 2 +Release: 3 License: MPL Group: Libraries Source0: http://ftp.gnome.org/pub/gnome/sources/opal/3.6/%{name}-%{version}.tar.bz2 @@ -25,21 +28,23 @@ Patch2: %{name}-ac.patch Patch3: %{name}-build.patch URL: http://www.openh323.org/ -BuildRequires: SDL-devel BuildRequires: autoconf BuildRequires: automake BuildRequires: expat-devel +BuildRequires: libstdc++-devel +BuildRequires: pkgconfig +BuildRequires: ptlib-devel >= 2.4.2-3 +BuildRequires: sed >= 4.0 +%if %{without sip_fax_only} +BuildRequires: SDL-devel BuildRequires: ffmpeg-devel BuildRequires: libgsm-devel -BuildRequires: libstdc++-devel BuildRequires: libtheora-devel BuildRequires: libx264-devel BuildRequires: openssl-devel -BuildRequires: pkgconfig -BuildRequires: ptlib-devel >= 2.4.2-3 -BuildRequires: sed >= 4.0 BuildRequires: speex-devel >= 1:1.1.5 BuildRequires: unixODBC-devel +%endif %requires_eq ptlib BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -98,8 +103,34 @@ OPAL_BUILD="yes"; export OPAL_BUILD %{__aclocal} %{__autoconf} +# Run grep '^OPAL_.*=' configure.ac|grep 'yes\|no' to check current defaults %configure \ +%if %{with sip_fax_only} + --enable-sip \ + --enable-t38 \ + --enable-fax \ + --enable-statistics \ + --disable-java \ + --disable-video \ + --disable-h323 \ + --disable-iax \ + --disable-h224 \ + --disable-h281 \ + --disable-sipim \ + --disable-rfc4103 \ + --disable-h450 \ + --disable-h460 \ + --disable-h501 \ + --disable-lid \ + --disable-ivr \ + --disable-rfc4175 \ + --disable-aec \ + --disable-g711plc \ + --disable-plugins +%else --enable-ixj +%endif + %{__make} %{?debug:debug}%{!?debug:opt} \ CC="%{__cc}" \ @@ -107,11 +138,13 @@ OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}" %{__cp} -a */libopal* . +%if %{without sip_fax_only} %{__make} -C samples/simple %{?debug:debug}%{!?debug:opt} \ CC="%{__cc}" \ CPLUS=%{__cxx} \ CFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG} -I`pwd`/include" \ LDFLAGS="%{rpmldflags} -L`pwd` -lpt -lopal" +%endif %install rm -rf $RPM_BUILD_ROOT @@ -120,7 +153,9 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install samples/simple/obj/simpleopal $RPM_BUILD_ROOT%{_bindir} +%{!?with_sip_fax_only:install samples/simple/obj/simpleopal $RPM_BUILD_ROOT%{_bindir}} + +install opal_{inc,defs}.mak $RPM_BUILD_ROOT%{_includedir}/opal %clean rm -rf $RPM_BUILD_ROOT @@ -130,8 +165,9 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_libdir}/lib*.so.*.* +%if %{without sip_fax_only} +%attr(755,root,root) %{_bindir}/* %dir %{_libdir}/opal-%{version} %dir %{_libdir}/opal-%{version}/codecs %dir %{_libdir}/opal-%{version}/codecs/audio @@ -154,6 +190,7 @@ %attr(755,root,root) %{_libdir}/opal-%{version}/codecs/video/theora_video_pwplugin.so %attr(755,root,root) %{_libdir}/opal-%{version}/lid/ixj_lid_pwplugin.so %attr(755,root,root) %{_libdir}/opal-%{version}/lid/vpb_lid_pwplugin.so +%endif %files devel %defattr(644,root,root,755) @@ -171,6 +208,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.49 2010/02/19 09:28:23 mmazur +- rel 3 +- added bcond sip_fax_only +- added missing *.mak files required for building by latest t38modem (ver 1.2) + Revision 1.48 2010/01/09 16:42:29 sparky - BR: expat-devel, unixODBC-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opal/opal.spec?r1=1.48&r2=1.49&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
