SPECS: openoffice.org.spec - BuildConflicts/BuildRequires: libicu-...

[glen]

Author: glen                         Date: Tue Oct 31 21:46:00 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BuildConflicts/BuildRequires: libicu-devel together make no sense

---- Files affected:
SPECS:
   openoffice.org.spec (1.611 -> 1.612) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.611 SPECS/openoffice.org.spec:1.612
--- SPECS/openoffice.org.spec:1.611	Mon Oct 30 18:50:14 2006
+++ SPECS/openoffice.org.spec	Tue Oct 31 22:45:52 2006
@@ -163,7 +163,7 @@
 %if %{with system_libhnj}
 BuildRequires:	libhnj-devel
 %endif
-BuildRequires:	libicu-devel
+BuildRequires:	libicu-devel <= 3.4.1
 BuildRequires:	libjpeg-devel
 BuildRequires:	libsndfile-devel
 BuildRequires:	libstdc++-devel >= 5:3.2.1
@@ -204,7 +204,6 @@
 BuildRequires:	zip
 BuildRequires:	zlib-devel
 BuildConflicts:	STLport4
-BuildConflicts:	libicu-devel > 3.4.1
 BuildConflicts:	java-sun = 1.4.2
 Requires(post,postun):	fontpostinst
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -2489,6 +2488,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.612  2006/10/31 21:45:52  glen
+- BuildConflicts/BuildRequires: libicu-devel together make no sense
+
 Revision 1.611  2006/10/30 17:50:14  sls
 - renamed mdbtools_fix.patch to mdbtools_fix.diff
 
================================================================

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