Attachment 600442 Details for Bug 843251 – updated fix

[patch] updated fix

0001-Resolves-rhbz-843251-FTBFS.patch (text/plain), 2.70 KB, created by David Tardon on 2012-07-26 06:40:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Tardon

Created: 2012-07-26 06:40:46 UTC

Size: 2.70 KB

patch

obsolete

>From 78d61df2799e2b553c227e85c6e29f113cdc6c5c Mon Sep 17 00:00:00 2001
>From: David Tardon <dtardon@redhat.com>
>Date: Thu, 26 Jul 2012 06:52:00 +0200
>Subject: [PATCH] Resolves: rhbz#843251 FTBFS
>
>---
> drop-superfluous-plus.patch   |   12 ++++++++++++
> openoffice.org-diafilter.spec |   12 +++++++-----
> 2 files changed, 19 insertions(+), 5 deletions(-)
> create mode 100644 drop-superfluous-plus.patch
>
>diff --git a/drop-superfluous-plus.patch b/drop-superfluous-plus.patch
>new file mode 100644
>index 0000000..412dc05
>--- /dev/null
>+++ b/drop-superfluous-plus.patch
>@@ -0,0 +1,12 @@
>+diff -up openoffice.org-diafilter-1.7.1/src/diafilter.cxx.dt openoffice.org-diafilter-1.7.1/src/diafilter.cxx
>+--- openoffice.org-diafilter-1.7.1/src/diafilter.cxx.dt	2012-07-26 06:34:23.193207591 +0200
>++++ openoffice.org-diafilter-1.7.1/src/diafilter.cxx	2012-07-26 06:34:26.669128030 +0200
>+@@ -1412,7 +1412,7 @@ PropertyMap DiaObject::handleStandardObj
>+             rtl::OUString::valueOf(nFlipHori) +
>+             USTR(" ") +
>+             rtl::OUString::valueOf(nFlipVert) +
>+-            USTR(") ") +
>++            USTR(") ")
>+             +
>+             USTR("translate (") +
>+             rtl::OUString::valueOf(nXTrans2) + USTR("cm") +
>diff --git a/openoffice.org-diafilter.spec b/openoffice.org-diafilter.spec
>index ce7cfa2..b5ccba5 100644
>--- a/openoffice.org-diafilter.spec
>+++ b/openoffice.org-diafilter.spec
>@@ -6,15 +6,16 @@ Group:          Applications/Productivity
> License:        GPLv3+ and LGPLv3+
> URL:            http://fedorahosted.org/openoffice.org-diafilter
> Source:         http://fedorahosted.org/releases/o/p/%{name}/%{name}-%{version}.tar.bz2
>+Patch0:         drop-superfluous-plus.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>-BuildRequires:    libreoffice-sdk >= 3.2.99, boost-devel, dia, zlib-devel
>-Requires:         libreoffice-draw >= 3.2.99
>+BuildRequires:    libreoffice-sdk >= 1:3.5.0.0, boost-devel, dia, zlib-devel
>+BuildRequires:    zip
>+Requires:         libreoffice-draw >= 1:3.5.0.0
> 
> %define instdir %{_libdir}
> %define baseinstdir %{instdir}/libreoffice
>-%define basisinstdir %{baseinstdir}/basis-link
>-%define sdkinstdir %{baseinstdir}/basis-link/sdk
>+%define sdkinstdir %{baseinstdir}/sdk
> 
> %description
> This package contains an importer component for LibreOffice to enable importing
>@@ -23,10 +24,11 @@ shapes are made available from Gallery for convenience.
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> %build
> . %{sdkinstdir}/setsdkenv_unix.sh
>-OPT_FLAGS="$RPM_OPT_FLAGS" DIA_SHAPES_DIR=/usr/share/dia/shapes make %{?_smp_mflags}
>+OPT_FLAGS="$RPM_OPT_FLAGS -DOSL_DEBUG_LEVEL=0" DIA_SHAPES_DIR=/usr/share/dia/shapes make %{?_smp_mflags}
> 
> %install
> rm -rf $RPM_BUILD_ROOT
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 843251: 600436 | 600442