commit a68f4690e6975f6edee814d41dbb926306b47145
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Sat Sep 29 12:37:56 2018 +0200
- up to 3.12.0
build.patch | 10 ++++++++++
linphone-sh.patch | 58 ++++++++++++++++++-------------------------------------
linphone.spec | 36 +++++++++++++++++++---------------
3 files changed, 49 insertions(+), 55 deletions(-)
---
diff --git a/linphone.spec b/linphone.spec
index 8979361..f41a133 100644
--- a/linphone.spec
+++ b/linphone.spec
@@ -17,18 +17,19 @@
Summary: Linphone Internet Phone
Summary(pl.UTF-8): Linphone - telefon internetowy
Name: linphone
-Version: 3.9.1
-Release: 4
+Version: 3.12.0
+Release: 1
License: GPL v2+
Group: Applications/Communications
Source0:
http://linphone.org/releases/sources/linphone/%{name}-%{version}.tar.gz
-# Source0-md5: c1c3a63b7ee963360e0e89cf5e5ff406
+# Source0-md5: 8292dbaa0a5d0a448dcbbee125e947e4
Patch0: %{name}-sh.patch
+Patch1: build.patch
URL: http://www.linphone.org/
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.9
-BuildRequires: belle-sip-devel >= 1.4.0
+BuildRequires: belle-sip-devel >= 1.5.0
%{?with_ldap:BuildRequires: cyrus-sasl-devel >= 2}
BuildRequires: doxygen
BuildRequires: ffmpeg-devel >= 0.4.5
@@ -125,7 +126,7 @@ Summary: Linphone libraries
Summary(pl.UTF-8): Biblioteki Linphone
Group: Libraries
Requires(post,postun): /sbin/ldconfig
-Requires: belle-sip >= 1.4.0
+Requires: belle-sip >= 1.5.0
Requires: glib2 >= 1:2.26.0
Requires: gtk+2 >= 2:2.22.0
%{?with_system_mediastreamer:Requires: mediastreamer >= 2.11.0}
@@ -144,7 +145,7 @@ Summary(pl.UTF-8): Telefon internetowy Linphone - pliki
nagłówkowe
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: alsa-lib-devel >= 0.9.0
-Requires: belle-sip-devel >= 1.4.0
+Requires: belle-sip-devel >= 1.5.0
Requires: glib2-devel >= 1:2.26.0
Requires: gtk+2 >= 2:2.22.0
Requires: libstdc++-devel
@@ -184,8 +185,13 @@ Statyczne wersje bibliotek Linphone.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+
+[ ! -e gitversion.h ] && echo '#define LIBLINPHONE_GIT_VERSION "%{version}"' >
coreapi/gitversion.h
%build
+%{__gettextize}
+%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
@@ -259,7 +265,6 @@ install -d $RPM_BUILD_ROOT%{_desktopdir} \
install pixmaps/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%{!?with_system_mediastreamer:%{__rm} -r
$RPM_BUILD_ROOT%{_docdir}/mediastreamer}
%{!?with_system_ortp:%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/ortp}
@@ -272,9 +277,6 @@ install pixmaps/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
# some tests
%{__rm} $RPM_BUILD_ROOT%{_bindir}/*_test
-install -d $RPM_BUILD_ROOT%{_examplesdir}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/tutorials/%{name}
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
%find_lang %{name} --with-gnome --all-name
%clean
@@ -291,9 +293,14 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog NEWS README TODO
+%doc AUTHORS BUGS ChangeLog NEWS README.md TODO
+%attr(755,root,root) %{_bindir}/liblinphone_tester
%attr(755,root,root) %{_bindir}/linphone
+%attr(755,root,root) %{_bindir}/linphone-daemon
+%attr(755,root,root) %{_bindir}/linphone-daemon-pipetest
%attr(755,root,root) %{_bindir}/lp-autoanswer
+%attr(755,root,root) %{_bindir}/lp-sendmsg
+%attr(755,root,root) %{_bindir}/lp-test-ecc
%{_desktopdir}/audio-assistant.desktop
%{_desktopdir}/linphone.desktop
%{_pixmapsdir}/linphone.png
@@ -310,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n linphonec
%defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog NEWS README TODO
+%doc AUTHORS BUGS ChangeLog NEWS README.md TODO
%attr(755,root,root) %{_bindir}/linphonec
%attr(755,root,root) %{_bindir}/linphonecsh
%{_mandir}/man1/linphonec.1*
@@ -320,7 +327,7 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/liblinphone.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.8
+%attr(755,root,root) %ghost %{_libdir}/liblinphone.so.9
%attr(755,root,root) %{_libdir}/liblinphonetester.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/liblinphonetester.so.0
%if %{without system_mediastreamer} || %{without system_ortp}
@@ -339,10 +346,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%doc coreapi/help/doc/html
%attr(755,root,root) %{_libdir}/liblinphone.so
%attr(755,root,root) %{_libdir}/liblinphonetester.so
-%attr(755,root,root) %{_bindir}/lp-gen-wrappers
%{_includedir}/linphone
%{_pkgconfigdir}/linphone.pc
%{_libdir}/liblinphone.la
@@ -363,7 +368,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{name}/include/ortp
%{_libdir}/%{name}/pkgconfig/ortp.pc
%endif
-%{_examplesdir}/%{name}-%{version}
%if %{with static_libs}
%files static
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..77c9d51
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,10 @@
+--- linphone-3.12.0/configure.ac~ 2018-09-29 12:18:42.000000000 +0200
++++ linphone-3.12.0/configure.ac 2018-09-29 12:19:42.148451748 +0200
+@@ -1069,7 +1069,6 @@ AC_CONFIG_FILES([ po/Makefile.in
+ build/macos/Info-linphone.plist
+ build/macos/pkg-distribution.xml
+ m4/Makefile
+- po/Makefile.in
+ pixmaps/Makefile
+ include/Makefile
+ include/linphone/Makefile
diff --git a/linphone-sh.patch b/linphone-sh.patch
index a48ad44..e747175 100644
--- a/linphone-sh.patch
+++ b/linphone-sh.patch
@@ -1,6 +1,20 @@
---- linphone-3.9.0/configure.ac.orig 2015-11-02 14:54:03.145448862 +0100
-+++ linphone-3.9.0/configure.ac 2015-11-11 20:35:39.387229789 +0100
-@@ -891,12 +891,12 @@
+--- linphone-3.10.2/configure.ac~ 2016-08-30 16:20:09.000000000 +0200
++++ linphone-3.10.2/configure.ac 2018-09-26 15:05:58.553546486 +0200
+@@ -898,11 +898,11 @@ if test x$enable_vcard != xfalse; then
+ if test "$found_vcard" = "no"; then
+ dnl Check the lib presence in case the PKG-CONFIG version is
not found
+ AC_LANG_CPLUSPLUS
+- AC_CHECK_LIB(belcard, main, [BELCARD_LIBS+=" -lbelr -lbelcard";
found_vcard=yes], [foo=bar])
++ AC_CHECK_LIB(belcard, main, [BELCARD_LIBS="$BELCARD_LIBS -lbelr
-lbelcard"; found_vcard=yes], [foo=bar])
+ AC_LANG_C
+ fi
+ if test "$found_vcard" = "yes"; then
+- BELCARD_CFLAGS+=" -DVCARD_ENABLED"
++ BELCARD_CFLAGS="$BELCARD_CFLAGS -DVCARD_ENABLED"
+ enable_vcard=true
+ else
+ if test x$enable_vcard = xtrue; then
+@@ -931,12 +931,12 @@ if test x$enable_sqlite_storage != xfals
PKG_CHECK_MODULES(SQLITE3,[sqlite3 >=
3.6.0],[found_sqlite=yes],[found_sqlite=no])
if test "$found_sqlite" = "no"; then
dnl Check the lib presence in case the PKG-CONFIG version is
not found
@@ -8,45 +22,11 @@
+ AC_CHECK_LIB(sqlite3, sqlite3_open,
[SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes], [foo=bar])
fi
if test "$found_sqlite" = "yes"; then
-- SQLITE3_CFLAGS+=" -DMSG_STORAGE_ENABLED"
-+ SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DMSG_STORAGE_ENABLED"
+- SQLITE3_CFLAGS+=" -DSQLITE_STORAGE_ENABLED"
++ SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DSQLITE_STORAGE_ENABLED"
if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
- SQLITE3_LIBS+=" -liconv"
+ SQLITE3_LIBS="$SQLITE3_LIBS -liconv"
fi
enable_msg_storage=true
else
-@@ -926,12 +926,12 @@
- PKG_CHECK_MODULES(SQLITE3,[sqlite3 >=
3.6.0],[found_sqlite=yes],[found_sqlite=no])
- if test "$found_sqlite" = "no"; then
- dnl Check the lib presence in case the PKG-CONFIG version is
not found
-- AC_CHECK_LIB(sqlite3, sqlite3_open, [SQLITE3_LIBS+="
-lsqlite3 "; found_sqlite=yes], [foo=bar])
-+ AC_CHECK_LIB(sqlite3, sqlite3_open,
[SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes], [foo=bar])
- fi
- if test "$found_sqlite" = "yes"; then
-- SQLITE3_CFLAGS+=" -DCALL_LOGS_STORAGE_ENABLED"
-+ SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DCALL_LOGS_STORAGE_ENABLED"
- if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
-- SQLITE3_LIBS+=" -liconv"
-+ SQLITE3_LIBS="$SQLITE3_LIBS -liconv"
- fi
- enable_call_logs_storage=true
- else
-@@ -1004,7 +1004,7 @@
- [
- AC_CHECK_LIB(cunit,CU_add_suite,[
- found_cunit=yes
-- CUNIT_LIBS+=" -lcunit"
-+ CUNIT_LIBS="$CUNIT_LIBS -lcunit"
- ])
-
- ])
-@@ -1013,7 +1013,7 @@
- case "$target_os" in
- *darwin*)
- #hack for macport
-- CUNIT_LIBS+=" -lncurses"
-+ CUNIT_LIBS="$CUNIT_LIBS -lncurses"
- ;;
- esac
- AM_CONDITIONAL([BUILD_CUNIT_TESTS], [test x$found_cunit = xyes && test
x$tests_enabled != xfalse])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linphone.git/commitdiff/a68f4690e6975f6edee814d41dbb926306b47145
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
