- fix non-java builds; should fix ppc and i486 th build

[packages/libreoffice.git] / libreoffice.spec

diff --git a/libreoffice.spec b/libreoffice.spec
index 4cfed7b50b34e8452d15640bb765d0955462d581..bda5b6c598cb9069d283b72f54196959055c73ab 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -79,7 +79,7 @@
 %define                tag                     %(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define                milestone       m17
 %define                _tag            %(echo %{tag} | tr - _)
-%define                _rel            0.1
+%define                _rel            0.2
 
 Summary:       OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):     OpenOffice.org - potężny pakiet biurowy
@@ -143,9 +143,10 @@ Patch1007: %{name}-gcc42-swregion.diff
 URL:           http://www.openoffice.org/
 BuildRequires: /usr/bin/getopt
 BuildRequires: GConf2-devel
-BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
 %{?with_system_agg:BuildRequires:      agg-devel}
+BuildRequires: atk-devel >= 1:1.9.0
 BuildRequires: autoconf >= 2.51
 BuildRequires: automake >= 1:1.9
 %{?with_system_beanshell:BuildRequires:        beanshell}
@@ -153,25 +154,25 @@ BuildRequires:    bison >= 1.875-4
 BuildRequires: boost-devel >= 1.35.0
 BuildRequires: cairo-devel >= 1.2.0
 %{?with_ccache:BuildRequires:  ccache}
-%{?with_icecream:BuildRequires:        icecream}
 BuildRequires: cups-devel
 BuildRequires: curl-devel >= 7.9.8
 %{?with_system_db:BuildRequires:       db-cxx-devel}
 %{?with_system_db:BuildRequires:       db-devel}
 BuildRequires: dbus-glib-devel
+# rpm has problems with determining this on builders
+# BuildRequires:       diskspace(%{_builddir}) >= 16Gb
 BuildRequires: flex
 BuildRequires: fontconfig-devel >= 1.0.1
 BuildRequires: freetype-devel >= 2.1
+BuildRequires: glib2-devel >= 2.13.5
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel}
 BuildRequires: gperf
 BuildRequires: gstreamer-devel >= 0.10.0
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires: gtk+2-devel >= 2:2.10
-BuildRequires: glib2-devel >= 2.13.5
-BuildRequires: pango-devel >= 1:1.17.3
-BuildRequires: atk-devel >= 1:1.9.0
 %{?with_system_hsqldb:BuildRequires:   hsqldb >= 1.8.0.9}
 %{?with_system_hunspell:BuildRequires: hunspell-devel >=1.2.2}
+%{?with_icecream:BuildRequires:        icecream}
 BuildRequires: icu
 %{?with_kde:BuildRequires:     kdelibs-devel}
 BuildRequires: libart_lgpl-devel
@@ -186,7 +187,6 @@ BuildRequires:      libwpd-devel >= 0.8.6
 BuildRequires: libwpg-devel >= 0.1.0
 BuildRequires: libwps-devel
 BuildRequires: libxml2-devel >= 2.0
-BuildRequires: xmlsec1-devel
 %{?with_access:%{?with_system_mdbtools:BuildRequires:  mdbtools-devel >= 0.6}}
 %{?with_mono:BuildRequires:    mono-csharp >= 1.2.3}
 %{?with_mono:BuildRequires:    mono-static >= 1.2.3}
@@ -197,6 +197,7 @@ BuildRequires:      nspr-devel >= 1:4.6-0.20041030.3
 BuildRequires: nss-devel >= 1:3.10
 BuildRequires: openldap-devel
 BuildRequires: pam-devel
+BuildRequires: pango-devel >= 1:1.17.3
 BuildRequires: perl-Archive-Zip
 BuildRequires: perl-base
 BuildRequires: pkgconfig
@@ -216,9 +217,11 @@ BuildRequires:     unzip
 %{?with_system_xalan:BuildRequires:    xalan-j}
 %{?with_system_xerces:BuildRequires:   xerces-j}
 %{?with_system_xml_apis:BuildRequires: xml-commons}
+BuildRequires: xmlsec1-devel
 BuildRequires: xmlsec1-nss-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXaw-devel
+BuildRequires: xorg-lib-libXtst-devel
 %{?with_system_xt:BuildRequires:       xt}
 BuildRequires: zip
 BuildRequires: zlib-devel
@@ -333,12 +336,12 @@ Requires: sed
 %{?with_system_xerces:Requires:        xerces-j}
 %{?with_system_xml_apis:Requires:      xml-commons}
 %{?with_system_xt:Requires:    xt}
+#Suggests:     chkfontpath
 Obsoletes:     oooqs
 Obsoletes:     openoffice
 Obsoletes:     openoffice-libs
 Obsoletes:     openoffice.org-dirs
 Obsoletes:     openoffice.org-libs < 1:2.1.0-0.m6.0.11
-#Suggests:     chkfontpath
 
 %description core
 Core libraries and support files for OpenOffice.org.
@@ -1199,8 +1202,8 @@ Group:            I18n
 Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ka
-This package provides resources containing menus and dialogs in Georgian
-language.
+This package provides resources containing menus and dialogs in
+Georgian language.
 
 %description i18n-ka -l pl.UTF-8
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
@@ -1732,8 +1735,8 @@ Group:            I18n
 Requires:      %{name}-core = %{epoch}:%{version}-%{release}
 
 %description i18n-ss
-This package provides resources containing menus and dialogs in
-Swati language.
+This package provides resources containing menus and dialogs in Swati
+language.
 
 %description i18n-ss -l pl.UTF-8
 Ten pakiet dostarcza zasoby zawierające menu i okna dialogowe w języku
@@ -2483,10 +2486,8 @@ if [ ! -f installed.stamp ]; then
        mv $RPM_BUILD_ROOT%{_libdir}/%{name}/share $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/share $RPM_BUILD_ROOT%{_libdir}/%{name}/share
        # more non-archidecture dependant nature data
-       %if %{with java}
        mv $RPM_BUILD_ROOT%{_libdir}/%{name}/help $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/help $RPM_BUILD_ROOT%{_libdir}/%{name}/help
-       %endif
        mv $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses $RPM_BUILD_ROOT%{_datadir}/%{name}
        ln -s ../../share/%{name}/licenses $RPM_BUILD_ROOT%{_libdir}/%{name}/licenses
        mv $RPM_BUILD_ROOT%{_libdir}/%{name}/readmes $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -2709,7 +2710,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/liblpsolve*.so
 #%attr(755,root,root) %{_libdir}/%{name}/program/libmtfrenderer.uno.so
 %attr(755,root,root) %{_libdir}/%{name}/program/liboox680*.so
-%ifnarch ppc
+%if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/librpt680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librptui680*.so
 %attr(755,root,root) %{_libdir}/%{name}/program/librptxml680*.so
@@ -2733,7 +2734,7 @@ fi
 %{_libdir}/%{name}/program/root5.dat
 %{_libdir}/%{name}/program/resource/acc680en-US.res
 %{_libdir}/%{name}/program/resource/chartcontroller680en-US.res
-%ifnarch ppc
+%if %{with java}
 %{_libdir}/%{name}/program/resource/rpt680en-US.res
 %{_libdir}/%{name}/program/resource/rptui680en-US.res
 %endif
@@ -3196,7 +3197,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/program/libcli_uno_glue.so
 %endif
 
-%if %{with java}
 %{_libdir}/%{name}/help
 %dir %{_datadir}/%{name}/help
 %dir %{_datadir}/%{name}/help/en
@@ -3207,6 +3207,7 @@ fi
 %{_datadir}/%{name}/help/en/shared.*
 %{_datadir}/%{name}/help/*.xsl
 
+%if %{with java}
 %attr(755,root,root) %{_libdir}/%{name}/program/javaldx
 %attr(755,root,root) %{_libdir}/%{name}/program/java-set-classpath
 %{_libdir}/%{name}/program/jvmfwk3rc
@@ -3660,14 +3661,12 @@ fi
 %{_iconsdir}/hicolor/*/apps/ooo-base.png
 %{_pixmapsdir}/ooo-base.png
 %{_libdir}/%{name}/program/resource/cnr680en-US.res
-%if %{with java}
 %{_datadir}/%{name}/help/en/sdatabase.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbapp
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbbrowser
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbquery
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbrelation
-%ifnarch ppc
+%if %{with java}
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbreport
 %endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/dbtable
@@ -3696,9 +3695,7 @@ fi
 %{_desktopdir}/oocalc.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-calc.png
 %{_pixmapsdir}/ooo-calc.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/scalc.*
-%endif
 %{_libdir}/%{name}/program/resource/analysis680en-US.res
 %{_libdir}/%{name}/program/resource/bf_sc680en-US.res
 %{_libdir}/%{name}/program/resource/date680en-US.res
@@ -3722,9 +3719,7 @@ fi
 %{_desktopdir}/oodraw.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-draw.png
 %{_pixmapsdir}/ooo-draw.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/sdraw.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/sdraw
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
 %{_datadir}/%{name}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
@@ -3750,8 +3745,8 @@ fi
 %{_desktopdir}/oowriter.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-writer.png
 %{_pixmapsdir}/ooo-writer.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/swriter.*
+%if %{with java}
 %{_libdir}/%{name}/program/classes/writer2latex.jar
 %endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/swriter
@@ -3783,9 +3778,7 @@ fi
 %{_desktopdir}/ooimpress.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-impress.png
 %{_pixmapsdir}/ooo-impress.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/simpress.*
-%endif
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/simpress
 %{_datadir}/%{name}/share/config/soffice.cfg/simpress/
 %{_datadir}/%{name}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
@@ -3807,9 +3800,7 @@ fi
 %{_desktopdir}/oomath.desktop
 %{_iconsdir}/hicolor/*/apps/ooo-math.png
 %{_pixmapsdir}/ooo-math.png
-%if %{with java}
 %{_datadir}/%{name}/help/en/smath.*
-%endif
 %{_libdir}/%{name}/program/resource/bf_sm680en-US.res
 %{_libdir}/%{name}/program/resource/sm680en-US.res
 %{_datadir}/%{name}/share/config/soffice.cfg/modules/smath