Hello community, here is the log from the commit of package libetonyek for openSUSE:Factory checked in at 2017-06-10 17:51:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libetonyek (Old) and /work/SRC/openSUSE:Factory/.libetonyek.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libetonyek" Sat Jun 10 17:51:01 2017 rev:15 rq:501089 version:0.1.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libetonyek/libetonyek.changes 2017-02-19 00:41:44.902376860 +0100 +++ /work/SRC/openSUSE:Factory/.libetonyek.new/libetonyek.changes 2017-06-10 17:51:02.339505469 +0200 @@ -1,0 +2,9 @@ +Mon Jun 5 08:00:24 UTC 2017 - tchva...@suse.com + +- Apply patches from debian (and taken from upstream git): + * fix-brain-fart.diff + * mdds-1.2.diff +- Add patch to fix test on i686: + * 0001-fix-test-on-i686.patch + +------------------------------------------------------------------- New: ---- 0001-fix-test-on-i686.patch fix-brain-fart.diff mdds-1.2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libetonyek.spec ++++++ --- /var/tmp/diff_new_pack.PoBD17/_old 2017-06-10 17:51:02.975415679 +0200 +++ /var/tmp/diff_new_pack.PoBD17/_new 2017-06-10 17:51:02.975415679 +0200 @@ -26,11 +26,11 @@ Url: https://wiki.documentfoundation.org/DLP/Libraries/libetonyek Source0: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz Patch0: libetonyek-0.1.6-drop_test.patch -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +Patch1: fix-brain-fart.diff +Patch2: mdds-1.2.diff +Patch3: 0001-fix-test-on-i686.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -38,16 +38,22 @@ BuildRequires: gperf BuildRequires: help2man BuildRequires: liblangtag-devel -BuildRequires: pkg-config +BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(librevenge-generators-0.0) BuildRequires: pkgconfig(librevenge-stream-0.0) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(mdds-1.0) +BuildRequires: pkgconfig(mdds-1.2) BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else +BuildRequires: boost-devel +%endif %description Libetonyek is library providing ability to interpret and import Apple Keynote @@ -90,9 +96,10 @@ %prep %setup -q -%patch0 -p1 +%autopatch -p1 %build +autoreconf -fvi export CXXFLAGS="%{optflags} -fvisibility-inlines-hidden" %configure \ --disable-silent-rules \ @@ -102,7 +109,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print @@ -120,7 +127,6 @@ make check %{?_smp_mflags} %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} ++++++ 0001-fix-test-on-i686.patch ++++++ >From b63a2f52d95243aef4660b2d4573f0e149eeb9a6 Mon Sep 17 00:00:00 2001 From: David Tardon <dtar...@redhat.com> Date: Wed, 22 Feb 2017 15:03:19 -0500 Subject: [PATCH] fix test on i686 Change-Id: Ib9dafdfd76175cc6bbcd94596f7a7bd8b924ed34 --- src/test/IWORKTransformationTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/IWORKTransformationTest.cpp b/src/test/IWORKTransformationTest.cpp index 77f0b27..5e96e60 100644 --- a/src/test/IWORKTransformationTest.cpp +++ b/src/test/IWORKTransformationTest.cpp @@ -232,7 +232,7 @@ void IWORKTransformationTest::testInverseOperations() CPPUNIT_ASSERT(scale(2, 1) * scale(0.5, 1) == eye); CPPUNIT_ASSERT(scale(1, 2) * scale(1, 0.5) == eye); - CPPUNIT_ASSERT(scale(3, 2) * scale(1.0 / 3, 0.5) == eye); + CPPUNIT_ASSERT(approxEqual(scale(3, 2) * scale(1.0 / 3, 0.5), eye)); // CPPUNIT_ASSERT(shear() == eye); -- 2.11.1 ++++++ fix-brain-fart.diff ++++++ >From 649f459c499ceab07446ed913ae661c31e13044a Mon Sep 17 00:00:00 2001 From: David Tardon <dtar...@redhat.com> Date: Thu, 14 Jan 2016 09:16:16 +0100 Subject: [PATCH] fix brain fart Change-Id: If7c5e3c6cebe2f97f1c9f5793cf25cea135a7735 --- src/lib/IWORKText.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp index 20d7c5b..ef34b4b 100644 --- a/src/lib/IWORKText.cpp +++ b/src/lib/IWORKText.cpp @@ -763,7 +763,7 @@ void IWORKText::insertBlockContent(const IWORKOutputElements &elements) { if (m_inPara) closePara(); - if (!m_inSection and needsSection()) + if (!m_inSection && needsSection()) openSection(); m_elements.append(elements); m_ignoreEmptyPara = true; @@ -817,7 +817,7 @@ void IWORKText::openPara() { assert(!m_inPara); - if (!m_inSection and needsSection()) + if (!m_inSection && needsSection()) openSection(); handleListLevelChange(m_listLevel); -- 2.5.0 ++++++ mdds-1.2.diff ++++++ --- libetonyek-0.1.6.orig/configure.ac +++ libetonyek-0.1.6/configure.ac @@ -24,8 +24,8 @@ AC_LANG([C++]) # Configure options # ================= AC_ARG_WITH([mdds], - AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]), - [], [with_mdds="1.0"]) + AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]), + [], [with_mdds="1.2"]) # =========================== # Find required base packages @@ -47,7 +47,7 @@ AC_PROG_SED AM_MISSING_PROG([GPERF], [gperf]) -AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])]) +AS_IF([test "$with_mdds" = "1.2"], [AX_CXX_COMPILE_STDCXX_11([noext])]) # =============== # Find librevenge @@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS]) # ========= # Find mdds # ========= -AS_IF([test "$with_mdds" = "1.0"], [ - PKG_CHECK_MODULES([MDDS], [mdds-1.0]) +AS_IF([test "$with_mdds" = "1.2"], [ + PKG_CHECK_MODULES([MDDS], [mdds-1.2]) ], [ PKG_CHECK_MODULES([MDDS], [mdds]) AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
