Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2012-05-22 08:16:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone", Maintainer is "jzh...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2011-11-25 23:04:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes 2012-05-22 08:16:39.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 15 16:28:43 UTC 2012 - i...@marguerite.su + +- update to version 3.5.2 + * updated oRTP to 0.20.0 + * updated mediastreamer2 to 2.8.2 + * added ZRTP media encryption + * added SILK audio codec +- modify patch linphone-v4l. +- drop applet sub-package. since no useful data. + +------------------------------------------------------------------- Old: ---- linphone-3.4.3.tar.gz linphone-v4l-2.6.38.patch New: ---- linphone-3.5.2.tar.gz linphone-v4l.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.TRDuo7/_old 2012-05-22 08:16:41.000000000 +0200 +++ /var/tmp/diff_new_pack.TRDuo7/_new 2012-05-22 08:16:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package linphone # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,37 +16,44 @@ # - Name: linphone -Version: 3.4.3 -Release: 1 -License: GPL-2.0+ +Version: 3.5.2 +Release: 0 Summary: Web Phone -URL: http://www.linphone.org +License: GPL-2.0+ Group: Productivity/Networking/Other +Url: http://www.linphone.org Source0: %{name}-%{version}.tar.gz Source1: %{name}-manual.tar.bz2 -Patch2: linphone-v4l-2.6.38.patch +#FIX-FOR-UPSTREAM port linux/videodev.h to libv4l-videodev.h +Patch1: linphone-v4l.patch BuildRequires: gcc-c++ -BuildRequires: gnome-panel-devel BuildRequires: gnutls-devel BuildRequires: intltool -BuildRequires: libtool BuildRequires: libeXosip2-devel BuildRequires: libosip2-devel +BuildRequires: libtool +BuildRequires: pkgconfig(libnotify) %if 0%{?suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %else BuildRequires: libv4l-devel %endif +# lack of libsrtp-devel in SuSE, enable both of them in the future. +#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 BuildRequires: perl-XML-Parser -BuildRequires: pkgconfig(libglade-2.0) BuildRequires: readline-devel BuildRequires: speex-devel -BuildRequires: alsa-devel -BuildRequires: libgsm-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(libglade-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build #NoSource: 0 @@ -58,19 +65,6 @@ SIP-based Web phones. With several codecs available, it can be used with high speed connections as well as 28k modems. -%package applet -Summary: Web Phone -Group: Productivity/Networking/Other -Requires: %{name} = %{version} - -%description applet -Linphone is a Web phone with a GNOME interface. It let you make -two-party calls over IP networks such as the Internet. It uses the IETF -protocols SIP (Session Initiation Protocol) and RTP (Realtime TransporT -Protocol) to make calls, so it should be able to communicate with other -SIP-based Web phones. With several codecs available, it can be used -with high speed connections as well as 28k modems. - %package devel Summary: Web Phone Group: Development/Libraries/Other @@ -79,8 +73,8 @@ Requires: glibc-devel Requires: libeXosip2-devel Requires: libosip2-devel -Requires: pkgconfig(glib-2.0) Requires: speex-devel +Requires: pkgconfig(glib-2.0) %description devel Linphone is a Web phone with a GNOME interface. It lets you make @@ -93,19 +87,18 @@ %prep %setup -q %if 0%{?suse_version} >= 1210 -%patch2 +%patch1 -p1 %endif translation-update-upstream find -name "CVS" -type d -exec rm -Rfv "{}" "+" %build %if 0%{?suse_version} >= 1140 -autoreconf -fi +./autogen.sh %endif # needed for linphone-1.3.0: export CFLAGS="%{optflags} -fno-strict-aliasing" -%configure\ - --libexecdir="%{_prefix}/lib/gnome-panel" \ +%configure \ --enable-console_ui=yes \ --enable-ipv6 \ --enable-nonstandard-gsm \ @@ -118,14 +111,19 @@ --disable-silent-rules \ --disable-static \ --disable-video \ - --disable-strict + --disable-strict \ + --enable-portaudio +# future use, now in d:l:c +# --enable-external-ortp +# lack of srtp in SuSE. enable it in the future. +# --enable-zrtp \ make %{?_smp_mflags} %install %make_install # install manual -tar -xjC %{buildroot}%{_datadir}/gnome/help/ -f %{S:1} +tar -xjC %{buildroot}%{_datadir}/gnome/help/ -f %{SOURCE1} #cleanup rm -fv %{buildroot}%{_includedir}/speex* rm -fv %{buildroot}%{_datadir}/doc/speex-1.1.4/manual.pdf @@ -133,6 +131,7 @@ # install desktop file %suse_update_desktop_file -D "linphone/index.xml.html" -G "SIP Phone" %{name} Network Telephony %find_lang %{name} +%find_lang mediastreamer cat %{name}.lang # delete unused man pages rm -rf %{buildroot}%{_mandir}/cs/ @@ -140,13 +139,17 @@ rm -f %{buildroot}%{_libdir}/*.*a cp -a ./pixmaps/linphone-3.png %{buildroot}%{_datadir}/linphone/linphone2.png # too lazy to fix up tutorial packaging... -rm -rf %{buildroot}/usr/share/tutorials +rm -rf %{buildroot}%{_datadir}/tutorials +# remove duplicate COPYING +rm -rf %{buildroot}%{_datadir}/%{name}/COPYING + +%fdupes %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{name}.lang +%files -f %{name}.lang -f mediastreamer.lang %defattr(-,root,root) %{_bindir}/* %{_datadir}/sounds/linphone @@ -161,11 +164,6 @@ %dir %{_datadir}/gnome/help %doc NEWS AUTHORS COPYING -%files applet -%defattr(-,root,root) -#%%{_libdir}/bonobo/servers/*.server -%{_prefix}/lib/gnome-panel - %files devel %defattr(-,root,root) %{_includedir}/linphone ++++++ linphone-3.4.3.tar.gz -> linphone-3.5.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/linphone/linphone-3.4.3.tar.gz /work/SRC/openSUSE:Factory/.linphone.new/linphone-3.5.2.tar.gz differ: char 5, line 1 ++++++ linphone-v4l-2.6.38.patch -> linphone-v4l.patch ++++++ --- /work/SRC/openSUSE:Factory/linphone/linphone-v4l-2.6.38.patch 2011-09-23 02:11:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone-v4l.patch 2012-05-22 08:16:39.000000000 +0200 @@ -1,18 +1,20 @@ ---- mediastreamer2/configure.ac 2010-06-18 09:55:26.000000000 +0200 -+++ mediastreamer2configure.ac 2011-07-07 11:53:29.595089325 +0200 -@@ -567,8 +567,8 @@ +diff -urN linphone-3.5.2.orig/mediastreamer2/configure.ac linphone-3.5.2/mediastreamer2/configure.ac +--- linphone-3.5.2.orig/mediastreamer2/configure.ac 2012-05-16 14:53:10.347774888 +0800 ++++ linphone-3.5.2/mediastreamer2/configure.ac 2012-05-16 15:01:19.443660348 +0800 +@@ -625,8 +625,8 @@ AC_SUBST(PACKAGE_DATA_DIR) dnl check for video4linux headers -AC_CHECK_HEADERS(linux/videodev.h linux/videodev2.h) --if test "${ac_cv_header_linux_videodev_h}" = "yes" || \ +-if test "${ac_cv_header_linux_videodev_h}" = "yes" ; then +AC_CHECK_HEADERS(libv4l1-videodev.h linux/videodev2.h) -+if test "${ac_cv_header_libv4l1_videodev_h}" = "yes" || \ - test "${ac_cv_header_linux_videodev2_h}" = "yes" ; then - found_v4l=yes ++if test "${ac_cv_header_libv4l1_videodev_h}" = "yes" ; then + found_v4l1=yes else ---- mediastreamer2/src/msv4l.c 2010-06-02 14:33:57.000000000 +0200 -+++ mediastreamer2/src/msv4l.c 2011-07-07 11:54:02.283089301 +0200 + found_v4l1=no +diff -urN linphone-3.5.2.orig/mediastreamer2/src/msv4l.c linphone-3.5.2/mediastreamer2/src/msv4l.c +--- linphone-3.5.2.orig/mediastreamer2/src/msv4l.c 2012-05-16 14:53:10.350774850 +0800 ++++ linphone-3.5.2/mediastreamer2/src/msv4l.c 2012-05-16 15:02:29.402785738 +0800 @@ -30,7 +30,7 @@ #include <string.h> #include <sys/mman.h> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
