This commit is contained in:
akdengi 2012-10-06 01:47:26 +04:00
parent 35d13cd809
commit 03b88998e5

View file

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