commit belle-sip for openSUSE:Factory
Hello community, here is the log from the commit of package belle-sip for openSUSE:Factory checked in at 2016-09-20 13:26:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/belle-sip (Old) and /work/SRC/openSUSE:Factory/.belle-sip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "belle-sip" Changes: -------- --- /work/SRC/openSUSE:Factory/belle-sip/belle-sip.changes 2016-09-13 22:25:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.belle-sip.new/belle-sip.changes 2016-09-20 13:26:46.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Sep 17 12:50:36 UTC 2016 - idonmez@suse.com + +- Remove reference to unneeded wakelock.h file (fix-build.patch) + +------------------------------------------------------------------- +Tue Sep 13 12:54:30 UTC 2016 - sor.alexei@meowr.ru + +- Switch to building with CMake. +- Add belle-sip-fix-pkgconfig.patch: Fix up pkgconfig. + +------------------------------------------------------------------- New: ---- belle-sip-fix-pkgconfig.patch fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ belle-sip.spec ++++++ --- /var/tmp/diff_new_pack.CXde9v/_old 2016-09-20 13:26:47.000000000 +0200 +++ /var/tmp/diff_new_pack.CXde9v/_new 2016-09-20 13:26:47.000000000 +0200 @@ -25,18 +25,21 @@ Summary: C object oriented SIP Stack License: GPL-2.0+ Group: System/Libraries -Url: http://linphone.org/technical-corner/belle-sip/overview -Source: https://github.com/BelledonneCommunications/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Url: https://www.linphone.org/technical-corner/belle-sip/overview +Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz Source1: http://antlr3.org/download/antlr-3.4-complete.jar Source2: baselibs.conf +# PATCH-FIX-OPENSUSE belle-sip-fix-pkgconfig.patch sor.alexei@meowr.ru -- Fix up pkgconfig. +Patch0: belle-sip-fix-pkgconfig.patch +# PATCH-FIX-OPENSUSE fix-build.patch idoenmez@suse.de -- Remove reference to wakelock.h +Patch1: fix-build.patch BuildRequires: antlr3c-devel -BuildRequires: autoconf -BuildRequires: automake +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: java -BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(bctoolbox) +BuildRequires: pkgconfig(zlib) %description Belle-sip is a SIP (RFC3261) implementation written in C, with an object oriented API. @@ -52,6 +55,8 @@ Summary: Headers and libraries for the belle-sip library Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} +Requires: pkgconfig(bctoolbox) +Requires: pkgconfig(zlib) %description devel Belle-sip is a SIP (RFC3261) implementation written in C, with an object oriented API. @@ -60,19 +65,20 @@ %prep %setup -q -cp -f %{SOURCE1} antlr.jar -sed -i "s|^\(antlr_java_prefixes=\).*$|\1\"$PWD\"|" configure.ac +%patch0 -p1 +%patch1 -p1 +cp -f %{SOURCE1} antlr3.jar %build -NOCONFIGURE=1 ./autogen.sh -%configure \ - --disable-strict \ - --disable-static +antlr_jar="$PWD/antlr3.jar" +%cmake \ + -DANTLR3_JAR_PATH="$antlr_jar" \ + -DENABLE_STRICT=OFF \ + -DENABLE_STATIC=OFF make %{?_smp_mflags} %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%cmake_install %post -n %{soname}%{sover} -p /sbin/ldconfig @@ -86,7 +92,9 @@ %files devel %defattr(-,root,root) %doc AUTHORS COPYING NEWS README +%{_bindir}/belle_sip_tester %{_includedir}/%{name}/ +%{_datadir}/BelleSIP/ %{_libdir}/%{soname}.so %{_libdir}/pkgconfig/%{name}.pc ++++++ belle-sip-1.5.0.tar.gz ++++++ ++++ 59974 lines of diff (skipped) ++++++ belle-sip-fix-pkgconfig.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,14 +137,14 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${prefix}/bin) -set(libdir ${prefix}/lib) +set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) set(includedir ${prefix}/include) get_filename_component(antlr3c_library_path "${ANTLR3C_LIBRARIES}" PATH) set(LIBS_PRIVATE "-L${antlr3c_library_path} -lantlr3c") get_filename_component(bctoolbox_library_path "${BCTOOLBOX_CORE_LIBRARIES}" PATH) set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${bctoolbox_library_path} -lbctoolbox") if(ZLIB_FOUND) - set(REQUIRES_PRIVATE "${REQUIRES_PRIVATE} z") + set(REQUIRES_PRIVATE "${REQUIRES_PRIVATE} zlib") endif() if(HAVE_LIBDL) set(LIBS_PRIVATE "${LIBS_PRIVATE} -ldl") ++++++ fix-build.patch ++++++ Index: belle-sip-1.5.0/include/CMakeLists.txt =================================================================== --- belle-sip-1.5.0.orig/include/CMakeLists.txt +++ belle-sip-1.5.0/include/CMakeLists.txt @@ -48,7 +48,6 @@ set(HEADER_FILES transaction.h types.h utils.h - wakelock.h ) set(BELLE_SIP_HEADER_FILES )
participants (1)
-
root@hilbert.suse.de