- BR reorders, ac/am versions

Changed files:
    libreoffice.spec -> 1.627

diff --git a/libreoffice.spec b/libreoffice.spec
index f34c159c501074cac0e3ee9690f3227f5d7ff3b2..d3a5fbbae636fc398d8381e23be74223e1a44bd3 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -113,8 +113,8 @@ Patch106:   %{name}-i66982.diff
 URL:           http://www.openoffice.org/
 BuildRequires: ImageMagick
 BuildRequires: STLport-devel >= 2:5.0.0
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: autoconf >= 2.51
+BuildRequires: automake >= 1:1.9
 %{?with_system_beanshell:BuildRequires:        beanshell}
 BuildRequires: bison >= 1.875-4
 BuildRequires: boost-devel
@@ -123,9 +123,6 @@ BuildRequires:      boost-spirit-devel
 BuildRequires: cairo-devel >= 0.5.2
 BuildRequires: cups-devel
 BuildRequires: curl-devel >= 7.9.8
-BuildRequires: mozilla-firefox-devel
-BuildRequires: xorg-lib-libX11-devel
-BuildRequires: xorg-xserver-Xvfb
 %if %{with system_db}
 BuildRequires: db-cxx-devel
 BuildRequires: db-devel
@@ -134,14 +131,6 @@ BuildRequires:     /usr/bin/getopt
 %if %{with gnomevfs}
 BuildRequires: gnome-vfs2-devel
 %endif
-%if %{with java}
-BuildRequires: ant
-BuildRequires: db-java >= 4.2.52-4
-BuildRequires: jar
-BuildRequires: jdk >= 1.4.0_00
-%else
-BuildRequires: libxslt-progs
-%endif
 BuildRequires: flex
 BuildRequires: fontconfig-devel >= 1.0.1
 BuildRequires: freetype-devel >= 2.1
@@ -169,6 +158,7 @@ BuildRequires:      nss-devel >= 1:3.10
 BuildRequires: mono-csharp >= 1.1.8
 BuildRequires: mono-devel >= 1.1.8
 %endif
+BuildRequires: mozilla-firefox-devel
 BuildRequires: nas-devel >= 1.7-1
 BuildRequires: neon-devel
 BuildRequires: openclipart-png >= 0:0.16
@@ -191,9 +181,19 @@ BuildRequires:     tcsh
 BuildRequires: unixODBC-devel
 BuildRequires: unzip
 BuildRequires: xmlsec1-nss-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-xserver-Xvfb
 %{?with_system_xt:BuildRequires:       xt}
 BuildRequires: zip
 BuildRequires: zlib-devel
+%if %{with java}
+BuildRequires: ant
+BuildRequires: db-java >= 4.2.52-4
+BuildRequires: jar
+BuildRequires: jdk >= 1.4.0_00
+%else
+BuildRequires: libxslt-progs
+%endif
 BuildConflicts:        STLport4
 BuildConflicts:        java-sun = 1.4.2
 Requires(post,postun): fontpostinst