Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2017-10-03 23:17:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linphone" Tue Oct 3 23:17:27 2017 rev:53 rq:528922 version:3.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2017-07-05 23:55:25.829655310 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes 2017-10-03 23:17:33.696083141 +0200 @@ -1,0 +2,26 @@ +Fri Sep 22 21:00:49 UTC 2017 - [email protected] + +- Provide liblinphone for the liblinphone-lang package. + +------------------------------------------------------------------- +Sun Sep 10 11:30:44 UTC 2017 - [email protected] + +- Fix the licence: there are GPL-3.0 licensed files. + +------------------------------------------------------------------- +Fri Jul 21 12:20:04 UTC 2017 - [email protected] + +- Update to version 3.12.0: + * C++ and C# bindings. + * Account Creator plugin API. + * Xamarin support. +- Switch from building with autotools to cmake. +- Add linphone-fix-pkgconfig.patch: Install linphone.pc. +- Add linphone-fix-gtkui-build.patch: Fix building of GtkUI. +- Disable the deprecated GTK+ UI for openSUSE Leap 15.x and newer, + but keep for older as the Qt inteface requires Qt 5.9+. +- Split libraries, data files and the CLI. +- Enable building C++ bindings. +- Add baselibs.conf. + +------------------------------------------------------------------- Old: ---- linphone-3.11.1.tar.gz New: ---- baselibs.conf linphone-3.12.0.tar.gz linphone-fix-gtkui-build.patch linphone-fix-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.NSbJC6/_old 2017-10-03 23:17:34.895914284 +0200 +++ /var/tmp/diff_new_pack.NSbJC6/_new 2017-10-03 23:17:34.899913721 +0200 @@ -16,165 +16,279 @@ # +%define sover 9 +%bcond_with linphone_gtkui %bcond_without ffmpeg Name: linphone -Version: 3.11.1 +Version: 3.12.0 Release: 0 Summary: Web Phone -License: GPL-2.0+ +License: GPL-2.0+ AND GPL-3.0 Group: Productivity/Networking/Other -Url: https://linphone.org/ +Url: https://linphone.org/technical-corner/liblinphone/overview Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz Source1: %{name}-manual.tar.bz2 -BuildRequires: autoconf -BuildRequires: automake +Source2: baselibs.conf +# PATCH-FIX-OPENSUSE linphone-fix-pkgconfig.patch [email protected] -- Install linphone.pc. +Patch0: linphone-fix-pkgconfig.patch +# PATCH-FIX-OPENSUSE linphone-fix-gtkui-build.patch -- Fix building of GtkUI. +Patch1: linphone-fix-gtkui-build.patch +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: intltool +BuildRequires: graphviz BuildRequires: libeXosip2-devel BuildRequires: libgsm-devel -BuildRequires: libtool BuildRequires: openldap2-devel BuildRequires: pkgconfig +BuildRequires: python BuildRequires: readline-devel BuildRequires: sgmltool -BuildRequires: update-desktop-files +BuildRequires: perl(LWP::Protocol::https) +BuildRequires: perl(Test::LWP::UserAgent) BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 BuildRequires: pkgconfig(belcard) -BuildRequires: pkgconfig(belle-sip) >= 1.6.0 -BuildRequires: pkgconfig(belr) -BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 -BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(belle-sip) >= 1.6.2 +BuildRequires: pkgconfig(libbzrtp) >= 1.0.6 BuildRequires: pkgconfig(libosip2) -BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(libv4l2) >= 0.8.4 BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mediastreamer) >= 2.15.0 +BuildRequires: pkgconfig(mediastreamer) >= 2.16.0 BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 1.0.0 +BuildRequires: pkgconfig(ortp) >= 1.0.2 BuildRequires: pkgconfig(speex) >= 1.1.6 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(udev) -Recommends: %{name}-lang %if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: pkgconfig(libsasl2) %endif +%if 0%{?suse_version} > 1320 +BuildRequires: python2-pystache +BuildRequires: python2-six +BuildRequires: python2-xml +%else +BuildRequires: python-pystache +BuildRequires: python-six +BuildRequires: python-xml +%endif %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) >= 51.0.0 BuildRequires: pkgconfig(libswscale) >= 0.7.0 %endif +%if %{with linphone_gtkui} +BuildRequires: hicolor-icon-theme +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libnotify) +Requires: lib%{name}-data = %{version} +Recommends: %{name}-cli = %{version} +Obsoletes: %{name}-lang < %{version} +%endif %description -Linphone is a Web phone with a GNOME interface. It lets you make +Linphone is a Web phone with a Qt interface. It lets 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 -Requires: %{name} = %{version} +%package cli +Summary: Web Phone Command Line Interface +Group: Productivity/Networking/Other +Requires: lib%{name}-data = %{version} + +%description cli +Linphone is a Web phone with a Qt interface. It lets 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. + +This package contains the command line interface. + +%package -n lib%{name}%{sover} +Summary: Web Phone library +Group: System/Libraries +Recommends: lib%{name}-lang +Provides: lib%{name} = %{version} + +%description -n lib%{name}%{sover} +Linphone is a Web phone with a Qt interface. It lets 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. + +This package contains a library. + +%lang_package -n lib%{name} + +%package -n lib%{name}++%{sover} +Summary: Web Phone C++ library +Group: System/Libraries + +%description -n lib%{name}++%{sover} +Linphone is a Web phone with a Qt interface. It lets 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. + +This package contains a C++ library. + +%package -n lib%{name}-data +Summary: Web Phone data files +Group: Productivity/Networking/Other +BuildArch: noarch + +%description -n lib%{name}-data +Linphone is a Web phone with a Qt interface. It lets 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. + +This package contains data files such as sounds. + +%package -n lib%{name}-devel +Summary: Web Phone Development files +Group: Development/Libraries/C and C++ Requires: glibc-devel +Requires: lib%{name}%{sover} = %{version} +Requires: lib%{name}++%{sover} = %{version} +Requires: lib%{name}-data = %{version} Requires: libeXosip2-devel Requires: libosip2-devel Requires: pkgconfig(alsa) Requires: pkgconfig(glib-2.0) Requires: pkgconfig(speex) +# linphone-devel was last used in openSUSE Leap 42.3. +Provides: %{name}-devel = %{version} +Obsoletes: %{name}-devel < %{version} %if %{with ffmpeg} Requires: pkgconfig(libavcodec) >= 51.0.0 Requires: pkgconfig(libswscale) >= 0.7.0 %endif -%description devel -Linphone is a Web phone with a GNOME interface. It lets you make +%description -n lib%{name}-devel +Linphone is a Web phone with a Qt interface. It lets 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. -%lang_package - %prep %setup -q %setup -q -D -T -a 1 -# Set tutorial path inside /usr/share/linphone/. -sed -i "s|\(\$(datadir)/\)\(tutorials\)/%{name}|\1%{name}/\2|" coreapi/help/Makefile.am +%patch0 -p1 +%patch1 -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure \ - --docdir=%{_docdir} \ - --enable-pulseaudio \ - --enable-external-ortp \ - --enable-external-mediastreamer \ - --enable-zrtp \ +%cmake \ + -DENABLE_CXX_WRAPPER=ON \ + -DENABLE_ROOTCA_DOWNLOAD=OFF \ + -DENABLE_ZRTP=ON \ %if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) - --enable-ldap \ + -DENABLE_LDAP=ON \ %endif -%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120100 && 0%{?is_opensuse}) && %{without ffmpeg} - --disable-video \ +%if %{without ffmpeg} + -DENABLE_VIDEO=OFF \ %endif - --disable-strict \ - --disable-static - +%if %{with gtkui} + -DENABLE_GTK_UI=ON \ +%endif + -DENABLE_TOOLS=OFF \ + -DENABLE_STRICT=OFF \ + -DENABLE_STATIC=OFF make %{?_smp_mflags} V=1 %install -%make_install +%cmake_install +mkdir -p %{buildroot}%{_docdir}/%{name}/ +mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ + %{buildroot}%{_docdir}/%{name}/ + +%if %{with gtkui} +install -Dpm 0755 share/%{name}.appdata.xml \ + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %suse_update_desktop_file -r -D "%{name}/index.xml.html" %{name} Network Telephony -find %{buildroot} -type f -name "*.la" -delete -print -# Remove duplicate COPYING. +# Remove a duplicate COPYING. rm -f %{buildroot}%{_datadir}/%{name}/COPYING +%endif + # Install the manual. mkdir -p %{buildroot}%{_datadir}/gnome/help/ cp -a %{name} %{buildroot}%{_datadir}/gnome/help/%{name}/ %find_lang %{name} %fdupes %{buildroot}%{_datadir}/ +%if %{with gtkui} %post %desktop_database_post %icon_theme_cache_post -/sbin/ldconfig %postun %desktop_database_postun %icon_theme_cache_postun -/sbin/ldconfig +%endif + +%post -n lib%{name}%{sover} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig + +%post -n lib%{name}++%{sover} -p /sbin/ldconfig + +%postun -n lib%{name}++%{sover} -p /sbin/ldconfig + +%if %{with gtkui} %files -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README.md -%{_bindir}/* -%{_libdir}/lib%{name}.so.* -%{_libdir}/lib%{name}tester.so.* +%{_bindir}/%{name} %{_datadir}/%{name}/ -%exclude %{_datadir}/%{name}/tutorials/ -%{_datadir}/lib%{name}_tester/ -%{_datadir}/sounds/%{name}/ -%{_datadir}/applications/*.desktop +%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/audio-assistant.desktop %{_datadir}/icons/hicolor/*/*/%{name}* %{_datadir}/pixmaps/%{name}/ -%{_mandir}/man?/*.?%{?ext_man} -%{_mandir}/*/man?/*.?%{?ext_man} %dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml +%endif -%files devel -%defattr(-,root,root) -%{_includedir}/%{name}/ -%{_libdir}/lib%{name}.so -%{_libdir}/lib%{name}tester.so -%{_libdir}/pkgconfig/%{name}.pc -%{_datadir}/%{name}/tutorials/ +%files cli +%{_bindir}/%{name}c* +%{_bindir}/%{name}-daemon* -%files lang -f %{name}.lang -%defattr(-,root,root) +%files -n lib%{name}%{sover} +%{_libdir}/lib%{name}.so.%{sover}* + +%files -n lib%{name}-lang -f %{name}.lang %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ +%files -n lib%{name}++%{sover} +%{_libdir}/lib%{name}++.so.%{sover}* + +%files -n lib%{name}-data +%doc AUTHORS COPYING NEWS README.md +%doc %{_docdir}/%{name}/ +%{_datadir}/sounds/%{name}/ + +%files -n lib%{name}-devel +%{_includedir}/%{name}*/ +%{_bindir}/lib%{name}_tester +%{_libdir}/lib%{name}.so +%{_libdir}/lib%{name}++.so +%{_datadir}/liblinphone_tester/ +%{_libdir}/pkgconfig/%{name}.pc +%{_datadir}/Linphone/ +%{_datadir}/LinphoneCxx/ + %changelog ++++++ baselibs.conf ++++++ liblinphone9 liblinphone++9 ++++++ linphone-3.11.1.tar.gz -> linphone-3.12.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/linphone/linphone-3.11.1.tar.gz /work/SRC/openSUSE:Factory/.linphone.new/linphone-3.12.0.tar.gz differ: char 5, line 1 ++++++ linphone-fix-gtkui-build.patch ++++++ --- a/gtk/main.c +++ b/gtk/main.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include "linphone.h" #include "linphone/lpconfig.h" -#include "liblinphone_gitversion.h" +#include "gitversion.h" #include <bctoolbox/vfs.h> #include <bctoolbox/defs.h> ++++++ linphone-fix-pkgconfig.patch ++++++ --- a/share/CMakeLists.txt +++ b/share/CMakeLists.txt @@ -42,6 +42,17 @@ if(ENABLE_ROOTCA_DOWNLOAD) ) endif() + +set(LINPHONE_CFLAGS ${LINPHONE_CPPFLAGS}) +set(LINPHONE_LIBS ${LINPHONE_LDFLAGS}) +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${prefix}/bin) +set(libdir ${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/include) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/linphone.pc.in ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/linphone.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + set(SOUND_FILES hello16000.wav hello8000.wav --- a/share/linphone.pc.in +++ b/share/linphone.pc.in @@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Requires: mediastreamer ortp bctoolbox +Requires: mediastreamer belle-sip belcard Name: liblinphone Description: All in one linphone libs. Version: @VERSION@
