[libreoffice/f20] Revert "temporarily disable libfreehand on rhel-7"

David Tardon dtardon at fedoraproject.org
Wed Sep 3 08:25:24 UTC 2014


commit 7b0a69751cd37f28e2263bdc65df26d3b02dae65
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Sep 3 10:23:29 2014 +0200

    Revert "temporarily disable libfreehand on rhel-7"
    
    This reverts commit 286b1970bb67129bacc2f564deec6a6b52f5cdba.
    
    Revert "disable libfreehand, i said"
    
    This reverts commit 791f45d88e8aa810d11ae859a58ca17cde832c5e.

 0001-disable-FreeHand-support.patch |   95 -----------------------------------
 libreoffice.spec                    |    3 +-
 2 files changed, 1 insertions(+), 97 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 6838248..9b5ab39 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -160,12 +160,12 @@ BuildRequires: pkgconfig(libabw-0.0)
 BuildRequires: pkgconfig(libcdr-0.0)
 BuildRequires: pkgconfig(libcmis-0.4)
 BuildRequires: pkgconfig(libetonyek-0.0)
+BuildRequires: pkgconfig(libfreehand-0.0)
 BuildRequires: pkgconfig(libmwaw-0.2)
 BuildRequires: pkgconfig(libodfgen-0.0)
 %endif
 %if 0%{?fedora}
 BuildRequires: pkgconfig(libe-book-0.0)
-BuildRequires: pkgconfig(libfreehand-0.0)
 BuildRequires: pkgconfig(libeot)
 %endif
 BuildRequires: pkgconfig(libcurl)
@@ -302,7 +302,6 @@ Patch47: 0001-Resolves-rhbz-1125588-port-LibreOffice-to-ppc64le.patch
 Patch48: 0001-refine-current-date-time-hotkey-handling.patch
 %if 0%{?rhel}
 Patch49: 0001-disable-libe-book-support.patch
-Patch50: 0001-disable-FreeHand-support.patch
 %endif
 Patch51: 0001-if-_CALL_ELF-if-defined-_CALL_ELF-_CALL_ELF-2.patch
 Patch52: 0001-fix-variable-name.patch


More information about the scm-commits mailing list