Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2012-11-02 22:23:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2012-10-24 07:13:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes 2012-11-02 22:23:49.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Oct 27 11:20:55 UTC 2012 - [email protected] + +- use external libortp and mediastreamer2 + +------------------------------------------------------------------- @@ -6,0 +12 @@ + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.M3SYZd/_old 2012-11-02 22:23:50.000000000 +0100 +++ /var/tmp/diff_new_pack.M3SYZd/_new 2012-11-02 22:23:50.000000000 +0100 @@ -44,26 +44,31 @@ %else BuildRequires: libv4l-devel %endif -# lack of libsrtp-devel in SuSE, enable both of them in the future. +# lack of srtp in SuSE. enable both of them in the future. +#BuildRequires: srtp-devel #BuildRequires: libzrtpcpp-devel BuildRequires: alsa-devel -# future use, now in d:l:c -#BuildRequires: libortp-devel BuildRequires: fdupes BuildRequires: libgsm-devel BuildRequires: libpulse-devel BuildRequires: libsoup-devel +%if 0%{?suse_version} > 1220 +BuildRequires: libortp-devel +BuildRequires: mediastreamer2-devel +%endif BuildRequires: perl-XML-Parser BuildRequires: readline-devel BuildRequires: speex-devel +%if 0%{?suse_version} BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +%endif BuildRequires: pkgconfig(libglade-2.0) # Video support - disabled by default due to patent issues %bcond_with video %if %{with video} -BuildRequires: libffmpeg-devel BuildRequires: libXv-devel +BuildRequires: libffmpeg-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build #NoSource: 0 @@ -87,8 +92,8 @@ Requires: speex-devel Requires: pkgconfig(glib-2.0) %if %{with video} -Requires: libffmpeg-devel Requires: libXv-devel +Requires: libffmpeg-devel %endif %description devel @@ -121,19 +126,21 @@ --enable-rsvp \ --enable-ssl \ --enable-alsa \ + --enable-portaudio \ +%if 0%{?suse_version} >= 1230 + --enable-external-ortp \ + --enable-external-mediastreamer \ +%endif --disable-date \ --disable-relativeprefix \ --disable-rpath \ --disable-silent-rules \ - --disable-static \ - --disable-strict \ %if !%{with video} --disable-video \ %endif - --enable-portaudio -# future use, now in d:l:c -# --enable-external-ortp -# lack of srtp in SuSE. enable it in the future. + --disable-strict \ + --disable-static +# lack of srtp in SuSE, enable it in the future: # --enable-zrtp \ make %{?_smp_mflags} @@ -149,7 +156,9 @@ # install desktop file %suse_update_desktop_file -D "linphone/index.xml.html" -G "SIP Phone" %{name} Network Telephony %find_lang %{name} +%if 0%{?suse_version} < 1230 %find_lang mediastreamer +%endif cat %{name}.lang # delete unused man pages rm -rf %{buildroot}%{_mandir}/cs/ @@ -167,17 +176,23 @@ %postun -p /sbin/ldconfig +%if 0%{?suse_version} < 1230 %files -f %{name}.lang -f mediastreamer.lang +%else +%files -f %{name}.lang +%endif %defattr(-,root,root) %{_bindir}/* %{_datadir}/sounds/linphone %{_libdir}/*.so.* +%if 0%{?suse_version} < 1230 +%dir %{_datadir}/images +%{_datadir}/images/nowebcamCIF.jpg +%endif %{_datadir}/linphone %{_datadir}/pixmaps/linphone %doc %{_mandir}/man1/*.* -%{_datadir}/images/nowebcamCIF.jpg %{_datadir}/applications/linphone.desktop -%dir %{_datadir}/images %dir %{_datadir}/gnome %dir %{_datadir}/gnome/help %doc NEWS AUTHORS COPYING @@ -185,8 +200,10 @@ %files devel %defattr(-,root,root) %{_includedir}/linphone +%if 0%{?suse_version} < 1230 %{_includedir}/ortp %{_includedir}/mediastreamer2 +%endif %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
