From 1fbfcf4337db98be86fe6d9a58b9640db01620f8f0e623b80c7780911b763f9d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 4 May 2017 06:55:27 +0000 Subject: [PATCH] Accepting request 492585 from network:utilities - Add cppunit.diff to support newer cppunit OBS-URL: https://build.opensuse.org/request/show/492585 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libtorrent?expand=0&rev=9 --- cppunit.diff | 22 ++++++++++++++++++++++ libtorrent.changes | 5 +++++ libtorrent.spec | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 cppunit.diff diff --git a/cppunit.diff b/cppunit.diff new file mode 100644 index 0000000..d2f4595 --- /dev/null +++ b/cppunit.diff @@ -0,0 +1,22 @@ +From: Jan Engelhardt +Date: 2017-05-03 10:29:41.992264417 +0200 +Subject: build: resolve autogen.sh failure with cppunit 1.14 + +configure.ac:22: warning: macro 'AM_PATH_CPPUNIT' not found in library +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libtorrent-0.13.6/configure.ac +=================================================================== +--- libtorrent-0.13.6.orig/configure.ac ++++ libtorrent-0.13.6/configure.ac +@@ -19,7 +19,7 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO + + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(config.h) +-AM_PATH_CPPUNIT(1.9.6) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit >= 1.9.6]) + + AC_PROG_CXX + diff --git a/libtorrent.changes b/libtorrent.changes index ff33148..62f0ded 100644 --- a/libtorrent.changes +++ b/libtorrent.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 3 08:37:07 UTC 2017 - jengelh@inai.de + +- Add cppunit.diff to support newer cppunit + ------------------------------------------------------------------- Sun Nov 15 17:08:10 UTC 2015 - mpluskal@suse.com diff --git a/libtorrent.spec b/libtorrent.spec index 48e12e2..0841694 100644 --- a/libtorrent.spec +++ b/libtorrent.spec @@ -28,6 +28,7 @@ Url: http://github.com/rakshasa/libtorrent #Git-Clone: git://github.com/rakshasa/libtorrent Source: https://github.com/rakshasa/libtorrent/archive/%version.tar.gz +Patch1: cppunit.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -64,6 +65,7 @@ seed speeds than the official client on high-bandwidth links. %prep %setup -q +%patch -P 1 -p1 %build export CFLAGS="%optflags -fno-strict-aliasing"