diff --git a/libreoffice.spec b/libreoffice.spec index 301fb4f..e5b2eaf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -23,7 +23,7 @@ %define version 3.6.2 -%define release 1 +%define release 2 %define buildver 3.6.2.2 %define jdkver 1_5_0_11 @@ -57,7 +57,7 @@ %{?_with_ccache: %global use_ccache 1} %{?_without_ccache: %global use_ccache 0} -%define use_smp 0 +%define use_smp 1 %{?_with_smp: %global use_smp 1} %{?_without_smp: %global use_smp 0} @@ -474,7 +474,6 @@ This package contains the architecture-independent files of LibreOffice. %package core Group: Office Summary: LibreOffice office suite architecture dependent files -Requires: hunspell Requires: hyphen Requires: libexttextcat # Due to the split @@ -3456,41 +3455,38 @@ ENVCXXFLAGS="%{optflags} %{optsafe} -g0 -fno-omit-frame-pointer -fno-strict-alia --with-distro=%{distroname} \ --with-vendor=Mandriva \ --with-build-version="%{buildver}" \ - --with-system-stdlibs \ - --enable-lockdown \ - --enable-opengl \ - --enable-odk \ - --enable-split-app-modules \ - --enable-split-opt-features \ - --enable-binfilter \ - --disable-mathmldtd \ - --with-system-mozilla=xulrunner \ - --with-system-icu \ - --with-system-jpeg \ - --with-system-hunspell \ - --with-system-zlib \ - --with-system-openssl \ - --with-system-expat \ - --with-system-libxml \ - --enable-python=system \ - --with-system-curl \ - --with-system-vigra \ - --with-system-neon \ - --with-system-libwpd \ - --with-system-libwps \ - --with-system-libwpg \ - --with-system-graphite \ - --without-junit \ - --with-system-cppunit \ - --with-system-redland \ - --with-system-nss \ - --with-system-postgresql \ - --with-system-mythes \ - --with-system-dicts \ - --enable-librsvg=system \ - --with-openldap \ - --disable-kde \ - --enable-kde4 \ + --with-system-stdlibs \ + --enable-lockdown \ + --enable-opengl \ + --enable-odk \ + --enable-split-app-modules \ + --enable-split-opt-features \ + --enable-binfilter \ + --with-system-mozilla=xulrunner \ + --with-system-icu \ + --with-system-jpeg \ + --with-system-hunspell \ + --with-system-zlib \ + --with-system-openssl \ + --with-system-expat \ + --with-system-libxml \ + --enable-python=system \ + --with-system-curl \ + --with-system-vigra \ + --with-system-neon \ + --with-system-libwpd \ + --with-system-libwps \ + --with-system-libwpg \ + --with-system-graphite \ + --without-junit \ + --with-system-cppunit \ + --with-system-redland \ + --with-system-nss \ + --with-system-postgresql \ + --enable-librsvg=system \ + --with-openldap \ + --disable-kde \ + --enable-kde4 \ --with-intro-bitmaps="%{SOURCE27}" \ --with-about-bitmaps="%{SOURCE28}" \ %if %{javaless} @@ -3647,16 +3643,16 @@ find %{buildroot} -type f -exec chmod u+rw '{}' \; find %{buildroot} -type f \( -name '*.so' -o -name '*.so.*' \) -exec chmod a+x '{}' \; # Change progress bar colors -sed -i '/^ProgressBarColor/d;/^ProgressFrameColor/d' \ - %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressBarColor=68,135,223' >> %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressFrameColor=112,171,229' >> %{buildroot}%{ooodir}/program/sofficerc +#sed -i '/^ProgressBarColor/d;/^ProgressFrameColor/d' \ +# %{buildroot}%{ooodir}/program/sofficerc +#echo 'ProgressBarColor=68,135,223' >> %{buildroot}%{ooodir}/program/sofficerc +#echo 'ProgressFrameColor=112,171,229' >> %{buildroot}%{ooodir}/program/sofficerc #dev300 fix position and size -sed -i '/^ProgressPosition/d;/^ProgressSize/d' \ - %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressPosition=10,307' >> %{buildroot}%{ooodir}/program/sofficerc -echo 'ProgressSize=377,9' >> %{buildroot}%{ooodir}/program/sofficerc +#sed -i '/^ProgressPosition/d;/^ProgressSize/d' \ +# %{buildroot}%{ooodir}/program/sofficerc +#echo 'ProgressPosition=10,307' >> %{buildroot}%{ooodir}/program/sofficerc +#echo 'ProgressSize=377,9' >> %{buildroot}%{ooodir}/program/sofficerc #libre # remove icons we dont have these sizes yet