diff --git a/libreoffice.spec b/libreoffice.spec index 6c94c59..ebe89f2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,8 +28,8 @@ %define langpacks 1 Name: libreoffice -Version: 4.2.3.3 -Release: 1mamba +Version: 4.3.2.2 +Release: 2mamba Summary: Free Office Suite Group: Graphical Desktop/Applications/Office Vendor: openmamba @@ -40,19 +40,29 @@ Source0: http://ftp.heanet.ie/mirrors/tdf/libreoffice/src/%{pkgver}/libreo Source2: http://%{download_mirror}/libreoffice/src/%{pkgver}/libreoffice-dictionaries-%{version}.tar.xz Source3: http://%{download_mirror}/libreoffice/src/%{pkgver}/libreoffice-help-%{version}.tar.xz Source4: http://%{download_mirror}/libreoffice/src/%{pkgver}/libreoffice-translations-%{version}.tar.xz -Source20: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll +Source32: libreoffice-4.1.3.2-openmamba-branding.tar.gz +#Source20: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll Source21: mamba-langpacks.tar.gz Source22: libreoffice-multiliblauncher.sh -Source23: http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz -Source24: http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Source25: http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -Source26: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Source27: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Source28: http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip -Source29: http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz -Source31: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Source32: libreoffice-4.1.3.2-openmamba-branding.tar.gz -Source33: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +Source23: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +Source24: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Source25: http://dev-www.libreoffice.org/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Source26: http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz +Source27: http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +Source28: http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2 +Source29: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Source30: http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.1.tar.bz2 +Source31: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 +#Source23: http://dev-www.libreoffice.org/src/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz +#Source24: http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +#Source25: http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz +#Source26: http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +#Source27: http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +#Source28: http://dev-www.libreoffice.org/src/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip +#Source29: http://dev-www.libreoffice.org/src/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz +#Source31: http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +#Source33: http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +#Source34: http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 Patch0: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch Patch1: openoffice.org-2.0.2.rh188467.printingdefaults.patch Patch2: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch @@ -252,6 +262,7 @@ BuildRequires: perl-Compress-Zlib BuildRequires: xorg-server-devel BuildRequires: xproto-devel BuildRequires: xulrunner-devel +BuildRequires: npapi-sdk-devel # java stuff BuildRequires: apache-ant BuildRequires: java-pentaho-libxml @@ -303,6 +314,8 @@ BuildRequires: libabw-devel BuildRequires: firebird-devel BuildRequires: libicu-devel >= 52.1 BuildRequires: libpoppler-devel >= 0.24.5 +BuildRequires: libmspub-devel >= 0.1.1 +BuildRequires: libglm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -652,16 +665,18 @@ Requires: %{name}-core = %{version}-%{release} A plug-in for LibreOffice that enables integration into the GNOME desktop environment. %prep -%setup -q -c -a 2 -a 3 -a 4 -a 32 +%setup -q -c -a 2 -a 3 -a4 -a 32 #% setup -q -c -T -D #:<< ____EOF rm -rf libreoffice-*/git-hooks for a in libreoffice-*/*; do mv $PWD/$a .; done -#remove "debugging" translations -rm -rf l10n/source/kid +##remove "debugging" translations +#rm -rf l10n/source/kid -%patch1 -p1 +#mv translations src + +#%patch1 -p1 #% patch6 -p0 -b .ooo101274.opening-a-directory.patch #% patch9 -p1 -b .ooo108637.sfx2.uisavedir.patch #%patch10 -p0 -b .ooo113273.desktop.resolvelinks.patch @@ -679,20 +694,19 @@ touch scripting/source/pyprov/delzip #touch scripting/util/provider/javascript/delzip mkdir -p ext_sources -cp %{SOURCE20} ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll -cp %{SOURCE23} ext_sources -cp %{SOURCE24} ext_sources -cp %{SOURCE25} ext_sources -cp %{SOURCE26} ext_sources -cp %{SOURCE27} ext_sources -%if !%with_system_saxon9 -cp %{SOURCE28} ext_sources -%endif -cp %{SOURCE29} ext_sources -%if !%with_system_hsqldb -cp %{SOURCE31} ext_sources -%endif -cp %{SOURCE33} ext_sources +#cp %{SOURCE20} ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll +#ln -s %{SOURCE4} ext_sources +ln -s %{SOURCE23} ext_sources +ln -s %{SOURCE24} ext_sources +ln -s %{SOURCE25} ext_sources +ln -s %{SOURCE26} ext_sources +ln -s %{SOURCE27} ext_sources +ln -s %{SOURCE28} ext_sources +ln -s %{SOURCE29} ext_sources +ln -s %{SOURCE30} ext_sources +ln -s %{SOURCE31} ext_sources + +chmod +x bin/unpack-sources %build #:<< ___EOF @@ -703,16 +717,16 @@ export KDE4DIR=%{_kde4_prefix} export PATH=$QT4DIR/bin:$PATH export JAVA_HOME=%{java_home} -./autogen.sh +#./autogen.sh %configure \ + --enable-release-build \ + --enable-icecream \ --disable-fetch-external \ --with-vendor="%{distribution}" \ --with-branding=`pwd`/branding \ --with-build-version="Ver: %{version}-%{release}" \ - --with-unix-wrapper=%{name} \ --disable-epm \ - --disable-mathmldtd \ --disable-gnome-vfs \ --enable-gio \ --enable-symbols \ @@ -721,17 +735,14 @@ export JAVA_HOME=%{java_home} --enable-dbus \ --enable-opengl \ --enable-vba \ - --with-vba-package-format="builtin" \ --with-system-libs \ --with-system-headers \ - --with-system-mozilla=libxul \ --with-system-mythes \ --with-system-dicts \ --with-external-dict-dir=%{_datadir}/myspell \ --without-myspell-dicts \ --without-fonts \ --without-ppds \ - --without-afms \ --with-lang=ALL \ --with-external-tar=$PWD/ext_sources \ --with-system-mdds \ @@ -763,7 +774,6 @@ export JAVA_HOME=%{java_home} --with-system-redland \ --with-system-zlib \ --with-system-openssl \ - --with-system-mysql \ --with-system-mysql-cppconn \ --enable-graphite \ --with-system-graphite \ @@ -771,6 +781,12 @@ export JAVA_HOME=%{java_home} --enable-split-app-modules \ --enable-split-opt-features +# --with-system-mozilla=libxul \ +# --with-unix-wrapper=%{name} \ +# --disable-mathmldtd \ +# --with-vba-package-format="builtin" \ +# --with-system-mysql \ +# --without-afms \ # --with-intro-bitmap=%{SOURCE32} \ # --with-intro-progressbar-position=60,316 \ # --with-intro-progressbar-size=409,8 \ @@ -2654,6 +2670,18 @@ This package contains additional Zulu translations and resources for LibreOffice %endif %changelog +* Sun Oct 26 2014 Silvan Calarco 4.3.2.2-2mamba +- rebuild with --enable-release-build + +* Thu Oct 09 2014 Silvan Calarco 4.3.2.2-1mamba +- update to 4.3.2.2 + +* Mon Jul 21 2014 Silvan Calarco 4.3.0.3-1mamba +- update to 4.3.0.3 + +* Sun May 11 2014 Silvan Calarco 4.2.4.2-1mamba +- update to 4.2.4.2 + * Sun Apr 13 2014 Silvan Calarco 4.2.3.3-1mamba - update to 4.2.3.3 diff --git a/unowinreg.dll b/unowinreg.dll deleted file mode 100644 index d78bb55..0000000 Binary files a/unowinreg.dll and /dev/null differ