Hello community, here is the log from the commit of package linphone for openSUSE:Factory checked in at 2017-10-09 19:43:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linphone (Old) and /work/SRC/openSUSE:Factory/.linphone.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linphone" Mon Oct 9 19:43:18 2017 rev:54 rq:531551 version:3.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/linphone/linphone.changes 2017-10-03 23:17:33.696083141 +0200 +++ /work/SRC/openSUSE:Factory/.linphone.new/linphone.changes 2017-10-09 19:47:12.358260990 +0200 @@ -1,0 +2,8 @@ +Wed Oct 4 08:22:32 UTC 2017 - olaf@aepfle.de + +- Add build condtionally for C++ bindings to fix build in Leap +- Remove build conditionally for ffmpeg +- Remove build conditionally for ldap +- Remove unused BuildRequires for disabled rootca download + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linphone.spec ++++++ --- /var/tmp/diff_new_pack.nHHxey/_old 2017-10-09 19:47:13.994189090 +0200 +++ /var/tmp/diff_new_pack.nHHxey/_new 2017-10-09 19:47:13.994189090 +0200 @@ -18,7 +18,7 @@ %define sover 9 %bcond_with linphone_gtkui -%bcond_without ffmpeg +%bcond_without linphone_cplusplus Name: linphone Version: 3.12.0 Release: 0 @@ -45,14 +45,15 @@ BuildRequires: python BuildRequires: readline-devel BuildRequires: sgmltool -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.2 +BuildRequires: pkgconfig(libavcodec) >= 51.0.0 BuildRequires: pkgconfig(libbzrtp) >= 1.0.6 BuildRequires: pkgconfig(libosip2) +BuildRequires: pkgconfig(libsasl2) +BuildRequires: pkgconfig(libswscale) >= 0.7.0 BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(libv4l2) >= 0.8.4 BuildRequires: pkgconfig(libxml-2.0) @@ -62,22 +63,19 @@ BuildRequires: pkgconfig(speex) >= 1.1.6 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(udev) -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -BuildRequires: pkgconfig(libsasl2) -%endif %if 0%{?suse_version} > 1320 +%if %{with linphone_cplusplus} BuildRequires: python2-pystache +%endif BuildRequires: python2-six BuildRequires: python2-xml %else +%if %{with linphone_cplusplus} BuildRequires: python-pystache +%endif 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 @@ -129,6 +127,7 @@ %lang_package -n lib%{name} +%if %{with linphone_cplusplus} %package -n lib%{name}++%{sover} Summary: Web Phone C++ library Group: System/Libraries @@ -142,6 +141,7 @@ with high speed connections as well as 28k modems. This package contains a C++ library. +%endif %package -n lib%{name}-data Summary: Web Phone data files @@ -173,10 +173,8 @@ # 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 -n lib%{name}-devel Linphone is a Web phone with a Qt interface. It lets you make @@ -194,15 +192,14 @@ %build %cmake \ +%if %{with linphone_cplusplus} -DENABLE_CXX_WRAPPER=ON \ +%else + -DENABLE_CXX_WRAPPER=OFF \ +%endif -DENABLE_ROOTCA_DOWNLOAD=OFF \ -DENABLE_ZRTP=ON \ -%if 0%{?suse_version} >= 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -DENABLE_LDAP=ON \ -%endif -%if %{without ffmpeg} - -DENABLE_VIDEO=OFF \ -%endif %if %{with gtkui} -DENABLE_GTK_UI=ON \ %endif @@ -246,9 +243,11 @@ %postun -n lib%{name}%{sover} -p /sbin/ldconfig +%if %{with linphone_cplusplus} %post -n lib%{name}++%{sover} -p /sbin/ldconfig %postun -n lib%{name}++%{sover} -p /sbin/ldconfig +%endif %if %{with gtkui} %files @@ -273,8 +272,10 @@ %dir %{_datadir}/gnome/ %dir %{_datadir}/gnome/help/ +%if %{with linphone_cplusplus} %files -n lib%{name}++%{sover} %{_libdir}/lib%{name}++.so.%{sover}* +%endif %files -n lib%{name}-data %doc AUTHORS COPYING NEWS README.md @@ -285,10 +286,14 @@ %{_includedir}/%{name}*/ %{_bindir}/lib%{name}_tester %{_libdir}/lib%{name}.so +%if %{with linphone_cplusplus} %{_libdir}/lib%{name}++.so +%endif %{_datadir}/liblinphone_tester/ %{_libdir}/pkgconfig/%{name}.pc %{_datadir}/Linphone/ +%if %{with linphone_cplusplus} %{_datadir}/LinphoneCxx/ +%endif %changelog