SPECS: openoffice.org.spec - R: shared-mime-info due file packaged...

[glen]

Author: glen                         Date: Tue Jan  9 18:24:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R: shared-mime-info due file packaged there

---- Files affected:
SPECS:
   openoffice.org.spec (1.690 -> 1.691) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.690 SPECS/openoffice.org.spec:1.691
--- SPECS/openoffice.org.spec:1.690	Tue Jan  9 14:06:29 2007
+++ SPECS/openoffice.org.spec	Tue Jan  9 19:24:15 2007
@@ -199,8 +199,8 @@
 BuildRequires:	tcsh
 BuildRequires:	unixODBC-devel
 BuildRequires:	unzip
-%{?with_system_xerces:BuildRequires:     xerces-j}
 %{?with_system_xalan:BuildRequires:     xalan-j}
+%{?with_system_xerces:BuildRequires:     xerces-j}
 BuildRequires:	xmlsec1-nss-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXaw-devel
@@ -322,6 +322,7 @@
 Group:		X11/Applications
 Requires:	%{name}-dirs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	shared-mime-info
 Obsoletes:	oooqs
 Obsoletes:	openoffice-libs
 Obsoletes:	openoffice.org-libs < 1:2.1.0-0.m6.0.11
@@ -2120,10 +2121,10 @@
 	--disable-odk \
 	--with-ccache-allowed \
 	--with-system-gcc \
-        %{?with_system_libhnj:--with-system-altlinuxhyphen} \
-        %{?with_system_xalan:--with-system-xalan} \
-        %{?with_system_xerces:--with-system-xerces} \
-        %{?with_system_xml_apis:--with-system-xml-apis} \
+	%{?with_system_libhnj:--with-system-altlinuxhyphen} \
+	%{?with_system_xalan:--with-system-xalan} \
+	%{?with_system_xerces:--with-system-xerces} \
+	%{?with_system_xml_apis:--with-system-xml-apis} \
 	--with-system-zlib \
 	--with-system-jpeg \
 	--with-system-libxml \
@@ -3776,6 +3777,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.691  2007/01/09 18:24:15  glen
+- R: shared-mime-info due file packaged there
+
 Revision 1.690  2007/01/09 13:06:29  glen
 - unify
 
================================================================

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