dtardon pushed to libreoffice (master). "there's no need for CSB hacks anymore"

[notifications at fedoraproject.org]

>From 46500297222ff95f1f4cad11ae045e9383099fae Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Tue, 24 Mar 2015 21:53:57 +0100
Subject: there's no need for CSB hacks anymore


diff --git a/libreoffice.spec b/libreoffice.spec
index 6846f2c..83a6e48 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -112,10 +112,6 @@ Source39:       %{external_url}/libgltf-0.0.2.tar.bz2
 Source40:       %{external_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
 Source41:       %{external_url}/libpagemaker-0.0.2.tar.bz2
 %global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libgltf --without-system-opencollada --without-system-libpagemaker
-%if 0%{?csb_rhel_7_hack}
-Source25:       %{external_url}/language-subtag-registry-2014-12-03.tar.bz2
-%global bundling_options %{?bundling_options} --without-system-liblangtag
-%endif
 %endif
 Source42:       %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
 
@@ -214,9 +210,7 @@ BuildRequires: pkgconfig(harfbuzz)
 BuildRequires: pkgconfig(lcms2)
 BuildRequires: pkgconfig(libclucene-core)
 BuildRequires: pkgconfig(libexttextcat)
-%if !0%{?csb_rhel_7_hack}
 BuildRequires: pkgconfig(liblangtag)
-%endif
 BuildRequires: pkgconfig(mythes)
 BuildRequires: pkgconfig(poppler-cpp)
 BuildRequires: postgresql-devel
@@ -306,10 +300,6 @@ Patch8: 0001-disable-failing-test-on-rhel-6.patch
 # not upstreamed
 Patch10: 0001-disable-libe-book-support.patch
 %endif
-%if 0%{?csb_rhel_7_hack}
-# not upstreamed
-Patch11: 0001-disable-failing-while-libmwaw-fix-pending.patch
-%endif
 # not upstreamed
 Patch12: 0001-Resolves-rhbz-1035092-no-shortcut-key-for-Italian-To.patch
 # not upstreamed
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=master&id=46500297222ff95f1f4cad11ae045e9383099fae

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390