Author: glen Date: Wed Jan 3 09:43:07 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- adapter
---- Files affected:
SPECS:
openoffice.org.spec (1.605.2.5 -> 1.605.2.6)
---- Diffs:
================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.605.2.5 SPECS/openoffice.org.spec:1.605.2.6
--- SPECS/openoffice.org.spec:1.605.2.5 Wed Jan 3 10:22:16 2007
+++ SPECS/openoffice.org.spec Wed Jan 3 10:43:02 2007
@@ -91,28 +91,28 @@
%if %{with firefox}
BuildRequires: mozilla-firefox-devel
%endif
-BuildRequires: XFree86-devel
+BuildRequires: /usr/bin/getopt
BuildRequires: XFree86-Xvfb
+BuildRequires: XFree86-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison >= 1.875-4
BuildRequires: boost-devel
-BuildRequires: boost-spirit-devel
BuildRequires: boost-mem_fn-devel
+BuildRequires: boost-spirit-devel
BuildRequires: cairo-devel >= 0.5.2
BuildRequires: cups-devel
BuildRequires: curl-devel >= 7.9.8
BuildRequires: db-cxx-devel
BuildRequires: db-devel
-BuildRequires: /usr/bin/getopt
%if %{with vfs}
BuildRequires: gnome-vfs2-devel
%endif
%if %{with java}
-BuildRequires: jdk >= 1.4.0_00
+BuildRequires: ant
BuildRequires: db-java >= 4.2.52-4
BuildRequires: jar
-BuildRequires: ant
+BuildRequires: jdk >= 1.4.0_00
%else
BuildRequires: libxslt-progs
%endif
@@ -122,22 +122,22 @@
BuildRequires: gtk+2-devel
BuildRequires: kdelibs-devel
BuildRequires: libart_lgpl-devel
+BuildRequires: libjpeg-devel
BuildRequires: libstdc++-devel >= 5:3.2.1
BuildRequires: libxml2-devel >= 2.0
-BuildRequires: libjpeg-devel
-BuildRequires: nss-devel >= 1:3.10
BuildRequires: nspr-devel >= 1:4.6-0.20041030.3
+BuildRequires: nss-devel >= 1:3.10
%if %{with mono}
-BuildRequires: mono-devel >= 1.1.8
BuildRequires: mono-csharp >= 1.1.8
+BuildRequires: mono-devel >= 1.1.8
%endif
BuildRequires: nas-devel >= 1.7-1
BuildRequires: neon-devel
BuildRequires: openclipart-png >= 0:0.16
BuildRequires: openldap-devel
BuildRequires: pam-devel
-BuildRequires: perl-base
BuildRequires: perl-Archive-Zip
+BuildRequires: perl-base
BuildRequires: pkgconfig
BuildRequires: python >= 2.2
BuildRequires: python-devel >= 2.2
@@ -211,8 +211,8 @@
Summary(pl): Interfejs KDE dla OpenOffice.org
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice-i18n-en-kde
Obsoletes: openoffice-i18n-en
+Obsoletes: openoffice-i18n-en-kde
Obsoletes: openoffice-libs-kde
%description libs-kde
@@ -226,8 +226,8 @@
Summary(pl): Interfejs GTK+ dla OpenOffice.org
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes: openoffice-i18n-en-gtk
Obsoletes: openoffice-i18n-en
+Obsoletes: openoffice-i18n-en-gtk
Obsoletes: openoffice-libs-gtk
%description libs-gtk
@@ -2326,6 +2326,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.605.2.6 2007/01/03 09:43:02 glen
+- adapter
+
Revision 1.605.2.5 2007/01/03 09:22:16 glen
- amd64 build fixes
- mozilla bcond renamed to firefox
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.605.2.5&r2=1.605.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
