[linphone] linphone-3.5.0 add BR: libnotify-devel spandsp-devel

[nucleo]

commit e8cbb3ea91ed971873605f4c3fd30c6a5041e45c
Author: nucleo <nucleo at fedoraproject.org>
Date:   Mon Dec 26 05:53:13 2011 +0200

    linphone-3.5.0
    add BR: libnotify-devel spandsp-devel

 .gitignore                     |    1 +
 linphone-3.4.3-chdir.patch     |   24 ------
 linphone-3.4.3-unusedvar.patch |  173 ----------------------------------------
 linphone-3.5.0-unusedvar.patch |   13 +++
 linphone.spec                  |   33 +++++---
 sources                        |    2 +-
 6 files changed, 35 insertions(+), 211 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9391d42..b99cf89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 linphone-3.2.1.tar.gz
 /linphone-3.4.3.tar.gz
+/linphone-3.5.0.tar.gz
diff --git a/linphone-3.5.0-unusedvar.patch b/linphone-3.5.0-unusedvar.patch
new file mode 100644
index 0000000..6954634
--- /dev/null
+++ b/linphone-3.5.0-unusedvar.patch
@@ -0,0 +1,13 @@
+--- linphone-3.5.0/mediastreamer2/tests/mediastream.c	2011-12-20 10:35:18.000000000 +0200
++++ linphone-3.5.0/mediastreamer2/tests/mediastream.c	2011-12-26 04:55:01.468278706 +0200
+@@ -430,8 +430,8 @@
+ 
+ 
+ void setup_media_streams(MediastreamDatas* args) {
+-	/*create the rtp session */
+-	MSWebCam *cam=NULL;
++	/*create the rtp session
++	MSWebCam *cam=NULL; */
+ 
+ 	ortp_init();
+ 	if (args->is_verbose) {
diff --git a/linphone.spec b/linphone.spec
index f4ad55f..3545cc2 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        3.4.3
-Release:        2%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -8,18 +8,18 @@ License:        GPLv2+
 URL:            http://www.linphone.org/
 
 Source0:        http://download.savannah.gnu.org/releases/linphone/3.4.x/sources/%{name}-%{version}.tar.gz
-Patch0:         linphone-3.4.3-chdir.patch
-Patch1:         linphone-3.4.3-unusedvar.patch
+Patch0:         linphone-3.5.0-unusedvar.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel >= 3.5.0
-BuildRequires:  libeXosip2-devel >= 3.5.0
-BuildRequires:  ortp-devel >= 0.16.4
+BuildRequires:  libosip2-devel >= 3.6.0
+BuildRequires:  libeXosip2-devel >= 3.6.0
+BuildRequires:  ortp-devel >= 1:0.18.0
 BuildRequires:  openssl-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  jack-audio-connection-kit-devel
 
+BuildRequires:  libnotify-devel
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
 
@@ -27,6 +27,7 @@ BuildRequires:  gtk2-devel >= 2.16
 BuildRequires:  alsa-lib-devel
 
 BuildRequires:  speex-devel >= 1.2
+BuildRequires:  spandsp-devel
 BuildRequires:  gsm-devel
 BuildRequires:  libsamplerate-devel
 
@@ -65,8 +66,7 @@ Libraries and headers required to develop software with linphone.
 
 %prep
 %setup0 -q
-%patch0 -p1 -b .chdir
-%patch1 -p1 -b .unusedvar
+%patch0 -p1 -b .unusedvar
 
 # remove bundled oRTP
 rm -rf oRTP
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{name}
+%find_lang mediastreamer
+cat mediastreamer.lang >> %{name}.lang
+
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -125,9 +128,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/*
-%{_libdir}/liblinphone.so.*
-%{_libdir}/libmediastreamer.so.*
-%{_libexecdir}/*
+%{_libdir}/liblinphone.so.4*
+%{_libdir}/libmediastreamer.so.1*
 %{_mandir}/man1/*
 %lang(cs) %{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
@@ -144,9 +146,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
 %{_libdir}/libmediastreamer.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/linphone.pc
+%{_libdir}/pkgconfig/mediastreamer.pc
 
 %changelog
+* Mon Dec 26 2011 Alexey Kurov <nucleo at fedoraproject.org> - 3.5.0-1
+- linphone-3.5.0
+- add BR: libnotify-devel spandsp-devel
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 3.4.3-2
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index 6016167..9dd900b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66e21f36d62c2094f7b4360262c46f20  linphone-3.4.3.tar.gz
+ad89cd6030a131f2b17ea50eb6f4c6f2  linphone-3.5.0.tar.gz