move rhel-7 baseline to 7.2

f41
David Tardon 9 years ago
parent 7bb5f7b56f
commit e452befa0c

14
.gitignore vendored

@ -13,33 +13,21 @@
/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
/boost_1_59_0.tar.bz2
/Firebird-2.5.2.26540-0.tar.bz2
/OpenCOLLADA-master-6509aa13af.tar.bz2
/harfbuzz-0.9.40.tar.bz2
/language-subtag-registry-2015-08-04.tar.bz2
/lcms2-2.6.tar.gz
/libabw-0.1.1.tar.bz2
/libatomic_ops-7_2d.zip
/libcdr-0.1.1.tar.bz2
/libe-book-0.1.1.tar.bz2
/libeot-0.01.tar.bz2
/libetonyek-0.1.5.tar.bz2
/libfreehand-0.1.1.tar.bz2
/libgltf-0.0.2.tar.bz2
/libmspub-0.1.2.tar.bz2
/libmwaw-0.3.6.tar.bz2
/libodfgen-0.1.5.tar.bz2
/libmwaw-0.3.7.tar.bz2
/liborcus-0.9.2.tar.gz
/libpagemaker-0.0.2.tar.bz2
/libvisio-0.1.3.tar.bz2
/librevenge-0.0.2.tar.bz2
/libwpd-0.10.0.tar.bz2
/libwpg-0.3.0.tar.bz2
/libwps-0.4.2.tar.bz2
/mdds_0.12.1.tar.bz2
/libreoffice-5.0.0.2.tar.xz

@ -77,26 +77,14 @@ Source9: %{external_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zi
%if 0%{?rhel}
Source10: %{external_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
Source11: %{external_url}/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
Source12: %{external_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
Source13: %{external_url}/liborcus-0.9.2.tar.gz
Source11: %{external_url}/liborcus-0.9.2.tar.gz
# system mdds 0.10.3 causes a crash in sc_ucalc unit test
Source14: %{external_url}/mdds_0.12.1.tar.bz2
Source15: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
Source16: %{external_url}/libcdr-0.1.1.tar.bz2
Source17: %{external_url}/libwpg-0.3.0.tar.bz2
Source18: %{external_url}/libwpd-0.10.0.tar.bz2
Source19: %{external_url}/libwps-0.4.2.tar.bz2
Source20: %{external_url}/libvisio-0.1.3.tar.bz2
Source21: %{external_url}/libmspub-0.1.2.tar.bz2
Source22: %{external_url}/libodfgen-0.1.5.tar.bz2
Source23: %{external_url}/libmwaw-0.3.6.tar.bz2
Source24: %{external_url}/libetonyek-0.1.5.tar.bz2
Source25: %{external_url}/libfreehand-0.1.1.tar.bz2
Source26: %{external_url}/libabw-0.1.1.tar.bz2
Source27: %{external_url}/librevenge-0.0.2.tar.bz2
Source28: %{external_url}/libpagemaker-0.0.2.tar.bz2
%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-glew --without-system-glm --without-system-orcus --without-system-mdds --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-libpagemaker
Source12: %{external_url}/mdds_0.12.1.tar.bz2
Source13: %{external_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
Source14: %{external_url}/libwps-0.4.2.tar.bz2
Source15: %{external_url}/libmwaw-0.3.7.tar.bz2
Source16: %{external_url}/libetonyek-0.1.5.tar.bz2
%global bundling_options %{?bundling_options} --without-system-ucpp --without-system-orcus --without-system-mdds --without-system-libcmis --without-system-libwps --without-system-libmwaw --without-system-libetonyek
%endif
%if 0%{?fedora}
@ -142,6 +130,7 @@ BuildRequires: boost-devel
BuildRequires: cups-devel
BuildRequires: expat-devel
BuildRequires: fontpackages-devel
BuildRequires: glm-devel
BuildRequires: hyphen-devel
BuildRequires: libicu-devel
BuildRequires: libjpeg-turbo-devel
@ -153,6 +142,7 @@ BuildRequires: pkgconfig(cppunit)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(evolution-data-server-1.2)
BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(glew) >= 1.10.0
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(graphite2)
BuildRequires: pkgconfig(gstreamer-1.0)
@ -162,11 +152,21 @@ BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libabw-0.1)
BuildRequires: pkgconfig(libcdr-0.1)
BuildRequires: pkgconfig(libclucene-core)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libexttextcat)
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(liblangtag)
BuildRequires: pkgconfig(libmspub-0.1)
BuildRequires: pkgconfig(libodfgen-0.1)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(libvisio-0.1)
BuildRequires: pkgconfig(libwpd-0.10)
BuildRequires: pkgconfig(libwpg-0.3)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(mythes)
@ -189,29 +189,17 @@ BuildRequires: vigra-devel
%if 0%{?fedora}
BuildRequires: firebird-devel
BuildRequires: firebird-libfbembed
BuildRequires: glm-devel
BuildRequires: kdelibs4-devel
BuildRequires: openCOLLADA-devel
BuildRequires: pkgconfig(glew) >= 1.10.0
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libabw-0.1)
BuildRequires: pkgconfig(libcdr-0.1)
BuildRequires: pkgconfig(libcmis-0.5)
BuildRequires: pkgconfig(libe-book-0.1)
BuildRequires: pkgconfig(libeot)
BuildRequires: pkgconfig(libetonyek-0.1)
BuildRequires: pkgconfig(libfreehand-0.1)
BuildRequires: pkgconfig(libgltf-0.0)
BuildRequires: pkgconfig(libmspub-0.1)
BuildRequires: pkgconfig(libmwaw-0.3)
BuildRequires: pkgconfig(libodfgen-0.1)
BuildRequires: pkgconfig(liborcus-0.10)
BuildRequires: pkgconfig(libpagemaker-0.0)
BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(libvisio-0.1)
BuildRequires: pkgconfig(libwpd-0.10)
BuildRequires: pkgconfig(libwpg-0.3)
BuildRequires: pkgconfig(libwps-0.4)
BuildRequires: pkgconfig(mdds) >= 0.12.0
%endif
@ -275,13 +263,6 @@ Patch19: 0001-tdf-96317-Add-API-for-copy-paste-from-to-the-widget.patch
%define sdkinstdir %{baseinstdir}/sdk
%define fontname opensymbol
# rhbz#1085420 make sure we do not provide bundled libraries
%if 0%{?rhel}
%global libo_bundled_libs_filter ^libGLEW\\.so.*$
%global __provides_exclude %{libo_bundled_libs_filter}
%global __requires_exclude %{libo_bundled_libs_filter}
%endif
%description
LibreOffice is an Open Source, community-developed, office productivity suite.
It includes the key desktop applications, such as a word processor,
@ -1506,12 +1487,7 @@ rm -f %{buildroot}%{baseinstdir}/program/classes/smoketest.jar
%{baseinstdir}/program/libfrmlo.so
%if 0%{?rhel}
%{baseinstdir}/program/libetonyek-0.1-lo.so.*
%{baseinstdir}/program/libGLEW.so.*
%{baseinstdir}/program/libmwaw-0.3-lo.so.*
%{baseinstdir}/program/libodfgen-0.1-lo.so.*
%{baseinstdir}/program/librevenge-0.0-lo.so.*
%{baseinstdir}/program/libwpd-0.10-lo.so.*
%{baseinstdir}/program/libwpg-0.3-lo.so.*
%{baseinstdir}/program/libwps-0.4-lo.so.*
%endif
%{baseinstdir}/program/libguesslanglo.so

Loading…
Cancel
Save