SPECS: openoffice.org.spec - BR reorders, ac/am versions

[qboosh]

Author: qboosh                       Date: Sat Dec 23 18:06:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR reorders, ac/am versions

---- Files affected:
SPECS:
   openoffice.org.spec (1.626 -> 1.627) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.626 SPECS/openoffice.org.spec:1.627
--- SPECS/openoffice.org.spec:1.626	Sat Dec 23 18:50:06 2006
+++ SPECS/openoffice.org.spec	Sat Dec 23 19:06:08 2006
@@ -114,8 +114,8 @@
 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
@@ -124,9 +124,6 @@
 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
@@ -135,14 +132,6 @@
 %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
@@ -170,6 +159,7 @@
 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
@@ -192,9 +182,19 @@
 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
@@ -2636,6 +2636,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.627  2006/12/23 18:06:08  qboosh
+- BR reorders, ac/am versions
+
 Revision 1.626  2006/12/23 17:50:06  qboosh
 - unified bcond name (vfs -> gnomevfs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.626&r2=1.627&f=u