Hello community, here is the log from the commit of package bctoolbox for openSUSE:Factory checked in at 2016-08-31 00:01:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bctoolbox (Old) and /work/SRC/openSUSE:Factory/.bctoolbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bctoolbox" Changes: -------- --- /work/SRC/openSUSE:Factory/bctoolbox/bctoolbox.changes 2016-08-17 12:05:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bctoolbox.new/bctoolbox.changes 2016-08-31 00:01:07.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Aug 27 14:34:12 UTC 2016 - [email protected] + +- Remove extraneous pkgconfig require + +------------------------------------------------------------------- +Sat Aug 27 11:03:49 UTC 2016 - [email protected] + +- Merge changes from home:X0F:HSF +- Fix generation of pkgconfig files + * bctoolbox-pkgconfig_1.patch + * bctoolbox-pkgconfig_2.patch + +------------------------------------------------------------------- New: ---- bctoolbox-pkgconfig_1.patch bctoolbox-pkgconfig_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bctoolbox.spec ++++++ --- /var/tmp/diff_new_pack.1adHmy/_old 2016-08-31 00:01:08.000000000 +0200 +++ /var/tmp/diff_new_pack.1adHmy/_new 2016-08-31 00:01:08.000000000 +0200 @@ -26,11 +26,14 @@ Url: https://linphone.org Source0: https://github.com/BelledonneCommunications/bctoolbox/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf +Patch0: bctoolbox-pkgconfig_1.patch +Patch1: bctoolbox-pkgconfig_2.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: mbedtls-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(cunit) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(zlib) %description Utilities library used by Belledonne Communications softwares like @@ -42,6 +45,9 @@ Requires: cmake Requires: lib%{name}%{sover} = %{version} Requires: lib%{name}-tester%{sover} = %{version} +Requires: mbedtls-devel +Requires: pkgconfig(cunit) +Requires: pkgconfig(zlib) %description devel Utilities library used by Belledonne Communications softwares like @@ -71,13 +77,14 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +sed -i "s|CUnit 3.0|CUnit 2.0|g" CMakeLists.txt %build -sed -i "s|CUnit 3.0|CUnit 2.0|g" CMakeLists.txt %cmake \ - -DENABLE_POLARSSL=no \ - -DENABLE_MBEDTLS=yes \ - -DENABLE_TESTS_COMPONENT=YES \ + -DMBEDTLS_V2=yes \ + -DENABLE_TESTS_COMPONENT=yes \ -DENABLE_TESTS=yes \ -DENABLE_STATIC=no make %{?_smp_mflags} @@ -86,8 +93,8 @@ %cmake_install %post -n lib%{name}%{sover} -p /sbin/ldconfig -%post -n lib%{name}-tester%{sover} -p /sbin/ldconfig %postun -n lib%{name}%{sover} -p /sbin/ldconfig +%post -n lib%{name}-tester%{sover} -p /sbin/ldconfig %postun -n lib%{name}-tester%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} @@ -104,10 +111,10 @@ %defattr(-,root,root) %doc COPYING README AUTHORS %{_libdir}/pkgconfig/%{name}.pc -%{_libdir}/pkgconfig/bctoolbox-tester.pc %{_libdir}/lib%{name}.so -%{_libdir}/lib%{name}-tester.so %{_datadir}/%{name}/ %{_includedir}/%{name}/ +%{_libdir}/pkgconfig/bctoolbox-tester.pc +%{_libdir}/lib%{name}-tester.so %changelog ++++++ bctoolbox-pkgconfig_1.patch ++++++ >From 447f0297640881bc1d27c922163aa3aedc14bf20 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini <[email protected]> Date: Tue, 16 Aug 2016 10:02:41 +0200 Subject: [PATCH] Fix .pc generation in configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 29c3615..5b90337 100755 --- a/configure.ac +++ b/configure.ac @@ -218,7 +218,7 @@ fi PROJECT_VERSION=$VERSION CMAKE_INSTALL_PREFIX=$install_prefix -CMAKE_INSTALL_FULL_LIBDIR=${install_prefix}/lib +CMAKE_INSTALL_FULL_LIBDIR=${libdir} CMAKE_INSTALL_FULL_INCLUDEDIR=${install_prefix}/include AC_SUBST(PROJECT_VERSION) ++++++ bctoolbox-pkgconfig_2.patch ++++++ >From ad078c2276c5a7ea80a31c754927be13e87eaf6c Mon Sep 17 00:00:00 2001 From: Simon Morlat <[email protected]> Date: Wed, 17 Aug 2016 14:45:24 +0200 Subject: [PATCH] exec_prefix is mandatory, at least for pkg-config 0.26 --- bctoolbox-tester.pc.in | 2 +- bctoolbox.pc.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bctoolbox-tester.pc.in b/bctoolbox-tester.pc.in index f9edaaa..6d8e2c0 100644 --- a/bctoolbox-tester.pc.in +++ b/bctoolbox-tester.pc.in @@ -1,6 +1,6 @@ # This is a comment prefix=@CMAKE_INSTALL_PREFIX@ - +exec_prefix=@CMAKE_INSTALL_PREFIX@ Name: bctoolbox-tester Description: A common set of tester wrappers used by Belledonne Communications's softwares Requires.private: @TESTER_REQUIRES_PRIVATE@ diff --git a/bctoolbox.pc.in b/bctoolbox.pc.in index 642ff75..fc00eb3 100644 --- a/bctoolbox.pc.in +++ b/bctoolbox.pc.in @@ -1,5 +1,6 @@ # This is a comment prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ Name: @PROJECT_NAME@ Description: A common set of tools used by Belledonne Communications's softwares
