packages: openoffice.org/openoffice.org.spec - adapter - base pkg is virtua...

[glen]

Author: glen                         Date: Tue Sep 22 22:37:18 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adapter
- base pkg is virtual, no deps should be there
- rel 8

---- Files affected:
packages/openoffice.org:
   openoffice.org.spec (1.839 -> 1.840) 

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.839 packages/openoffice.org/openoffice.org.spec:1.840
--- packages/openoffice.org/openoffice.org.spec:1.839	Tue Jul 28 18:13:35 2009
+++ packages/openoffice.org/openoffice.org.spec	Wed Sep 23 00:37:13 2009
@@ -77,7 +77,7 @@
 %define		tag			%(echo %{mws} | tr A-Z a-z)-%{milestone}
 %define		milestone	m15
 %define		_tag		%(echo %{tag} | tr - _)
-%define		_rel		7
+%define		_rel		8
 
 Summary:	OpenOffice.org - powerful office suite
 Summary(pl.UTF-8):	OpenOffice.org - potężny pakiet biurowy
@@ -164,9 +164,6 @@
 Patch2003:	%{name}-hotfix-glibc210.patch
 Patch2004:	%{name}-hotfix-xulrunner.patch
 URL:		http://www.openoffice.org/
-BuildConflicts:	xmlsec1-devel
-# contains (dlopened) *.so libs
-BuildConflicts:	xmlsec1-nss
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -175,7 +172,6 @@
 BuildRequires:	atk-devel >= 1:1.9.0
 BuildRequires:	autoconf >= 2.51
 BuildRequires:	automake >= 1:1.9
-%{?with_system_beanshell:BuildRequires:	java-beanshell}
 BuildRequires:	bison >= 1.875-4
 BuildRequires:	boost-devel >= 1.35.0
 BuildRequires:	cairo-devel >= 1.2.0
@@ -185,8 +181,6 @@
 %{?with_system_db:BuildRequires:	db-cxx-devel}
 %{?with_system_db:BuildRequires:	db-devel}
 BuildRequires:	dbus-glib-devel >= 0.70
-# 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
@@ -200,10 +194,11 @@
 %{?with_system_hunspell:BuildRequires:	hunspell-devel >=1.2.2}
 %{?with_icecream:BuildRequires:	icecream}
 BuildRequires:	icu
+%{?with_system_beanshell:BuildRequires:	java-beanshell}
 %if %{with kde}
+BuildRequires:	kde4-kde3support-devel
 BuildConflicts:	kde4-kdelibs-devel
 BuildConflicts:	kde4-kdepimlibs-devel
-BuildRequires:	kde4-kde3support-devel
 %endif
 BuildRequires:	libart_lgpl-devel
 BuildRequires:	libbonobo-devel >= 2.0
@@ -247,9 +242,9 @@
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.5
 BuildRequires:	tcsh
-BuildRequires:	vigra-devel
 BuildRequires:	unixODBC-devel >= 2.2.12-2
 BuildRequires:	unzip
+BuildRequires:	vigra-devel
 %{?with_system_xalan:BuildRequires:	xalan-j}
 %{?with_system_xerces:BuildRequires:	xerces-j}
 %{?with_system_xml_apis:BuildRequires:	xml-commons}
@@ -262,11 +257,14 @@
 %if %{with java}
 BuildRequires:	ant
 %{?with_system_db:BuildRequires:	db-java >= 4.3}
+BuildRequires:	java-sun >= 1.4.0_00
 BuildRequires:	java-sun-jre-X11
 BuildRequires:	java-sun-tools
-BuildRequires:	java-sun >= 1.4.0_00
 %endif
 BuildRequires:	xulrunner-devel
+BuildConflicts:	xmlsec1-devel
+# contains (dlopened) *.so libs
+BuildConflicts:	xmlsec1-nss
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-calc = %{epoch}:%{version}-%{release}
 Requires:	%{name}-draw = %{epoch}:%{version}-%{release}
@@ -280,7 +278,6 @@
 Requires:	%{name}-web = %{epoch}:%{version}-%{release}
 Requires:	%{name}-writer = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xsltfilter = %{epoch}:%{version}-%{release}
-Requires:	fonts-TTF-OpenSymbol
 ExclusiveArch:	%{ix86} %{x8664} ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -361,14 +358,15 @@
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	shared-mime-info
 Requires:	%{name}-ure = %{epoch}:%{version}-%{release}
-%{?with_system_beanshell:Requires:	java-beanshell}
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
-%{?with_system_hsqldb:Requires:	hsqldb >= 1.8.0}
+Requires:	fonts-TTF-OpenSymbol
+%{?with_system_hsqldb:Requires:	hsqldb:Requires:	hsqldb >= 1.8.0}
+%{?with_system_beanshell:Requires:	java-beanshell}
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
-Requires:	sed
 Requires:	saxon
+Requires:	sed
 %{?with_system_xalan:Requires:	xalan-j}
 %{?with_system_xerces:Requires:	xerces-j}
 %{?with_system_xml_apis:Requires:	xml-commons}
@@ -609,12 +607,13 @@
 Group:		Libraries
 
 %description ure
-UNO is the component model of OpenOffice.org. UNO offers interoperability
-between programming languages, other components models and hardware
-architectures, either in process or over process boundaries, in the Intranet
-as well as in the Internet. UNO components may be implemented in and accessed
-from any programming language for which a UNO implementation (AKA language
-binding) and an appropriate bridge or adapter exists.
+UNO is the component model of OpenOffice.org. UNO offers
+interoperability between programming languages, other components
+models and hardware architectures, either in process or over process
+boundaries, in the Intranet as well as in the Internet. UNO components
+may be implemented in and accessed from any programming language for
+which a UNO implementation (AKA language binding) and an appropriate
+bridge or adapter exists.
 
 %package -n fonts-TTF-OpenSymbol
 Summary:	OpenSymbol fonts
@@ -2538,7 +2537,7 @@
 
 # Find out locales
 find_lang() {
-	local lang=$(echo $1 | sed -e 's/_/-/') 
+	local lang=$(echo $1 | sed -e 's/_/-/')
 	local langfn="$1"
 	echo "%%defattr(644,root,root,755)" > ${langfn}.lang
 
@@ -4238,6 +4237,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.840  2009/09/22 22:37:13  glen
+- adapter
+- base pkg is virtual, no deps should be there
+- rel 8
+
 Revision 1.839  2009/07/28 16:13:35  arekm
 - rel 7; updated from git; builds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.839&r2=1.840&f=u