SPECS: openoffice.org.spec - adapter

[glen]

Author: glen                         Date: Sat Jul 19 14:30:22 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapter

---- Files affected:
SPECS:
   openoffice.org.spec (1.793 -> 1.794) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.793 SPECS/openoffice.org.spec:1.794
--- SPECS/openoffice.org.spec:1.793	Sat Jul 19 16:23:52 2008
+++ SPECS/openoffice.org.spec	Sat Jul 19 16:30:17 2008
@@ -144,9 +144,10 @@
 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}
@@ -154,7 +155,6 @@
 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}
@@ -164,16 +164,15 @@
 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
@@ -188,7 +187,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}
@@ -199,6 +197,7 @@
 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
@@ -218,6 +217,7 @@
 %{?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
@@ -336,12 +336,12 @@
 %{?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.
@@ -1202,8 +1202,8 @@
 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
@@ -1735,8 +1735,8 @@
 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
@@ -4195,6 +4195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.794  2008/07/19 14:30:17  glen
+- adapter
+
 Revision 1.793  2008/07/19 14:23:52  glen
 - restore diskspace BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.793&r2=1.794&f=u