packages (DEVEL): openoffice.org/openoffice.org.spec - start update to 3.2.0
megabajt
megabajt at pld-linux.org
Fri Jan 29 23:19:38 CET 2010
Author: megabajt Date: Fri Jan 29 22:19:38 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- start update to 3.2.0
---- Files affected:
packages/openoffice.org:
openoffice.org.spec (1.843 -> 1.843.2.1)
---- Diffs:
================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.843 packages/openoffice.org/openoffice.org.spec:1.843.2.1
--- packages/openoffice.org/openoffice.org.spec:1.843 Sat Jan 2 00:14:44 2010
+++ packages/openoffice.org/openoffice.org.spec Fri Jan 29 23:19:33 2010
@@ -35,7 +35,7 @@
#
# Conditional build:
-%bcond_without gnomevfs # GNOME VFS and Evolution 2 support
+%bcond_with gnomevfs # GNOME VFS and Evolution 2 support
%bcond_without java # without Java support (disables help support)
%bcond_without kde # KDE L&F packages
%bcond_with mono # enable compilation of mono bindings
@@ -72,17 +72,17 @@
%undefine with_system_hsqldb
%endif
-%define upd 300
+%define upd 320
%define mws OOO%{upd}
%define tag %(echo %{mws} | tr A-Z a-z)-%{milestone}
-%define milestone m15
+%define milestone m11
%define _tag %(echo %{tag} | tr - _)
-%define _rel 9
+%define _rel 0.1
Summary: OpenOffice.org - powerful office suite
Summary(pl.UTF-8): OpenOffice.org - potężny pakiet biurowy
Name: openoffice.org
-Version: 3.0.1.3
+Version: 3.2.0.4
Release: %{_tag}.%{_rel}
Epoch: 1
License: GPL/LGPL
@@ -90,47 +90,53 @@
# we use git because released tarballs are buggy too often
# git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build
# cd ooo-build
-# git checkout -b ooo-build-3-0-1 origin/ooo-build-3-0-1
-Source0: ooo-build-20090727.tar.bz2
-# Source0-md5: 3fd9197e22fa801e2c2df408df462a22
-Source1: http://download.go-oo.org/DEV300/ooo-cli-prebuilt-3.0.tar.bz2
-# Source1-md5: 8b3979cd7fd99b7e9722fd8f690e69a9
+# git checkout -b ooo-build-3-2 origin/ooo-build-3-2
+Source0: ooo-build-20100129.tar.bz2
+# Source0-md5: dd6841fb58b5e4480d2c6135e4ab7e86
+Source1: http://download.go-oo.org/DEV300/ooo-cli-prebuilt-3.2.tar.bz2
+# Source1-md5: b4e4ad9da4cf1033096609c95ad50bdb
Source2: http://download.go-oo.org/%{mws}/%{tag}-base.tar.bz2
-# Source2-md5: c2eb3afafe7305be70c46f0bbc82ccff
+# Source2-md5: d2986a9264f1b7812679c587938a046a
Source3: http://download.go-oo.org/%{mws}/%{tag}-calc.tar.bz2
-# Source3-md5: 78bf10d9a15f5cb801999dc6be0144d1
-Source4: http://download.go-oo.org/%{mws}/%{tag}-l10n.tar.bz2
-# Source4-md5: 02b20bd978e342de45ef84d3232e3f94
+# Source3-md5: 8987f0268b11b95acb8ee73c9a04b982
+Source4: http://download.go-oo.org/%{mws}/%{tag}-extras.tar.bz2
+# Source4-md5: e132ea3a576962239ec5ea94ef15e984
Source5: http://download.go-oo.org/%{mws}/%{tag}-ure.tar.bz2
-# Source5-md5: 65565feb49307361209b610249e45dc7
+# Source5-md5: 8110d7987beddbd569611db22fd0a979
Source6: http://download.go-oo.org/%{mws}/%{tag}-writer.tar.bz2
-# Source6-md5: 04f68dfb9a34b5c0766a65e6ff48b841
+# Source6-md5: 49cf1a676eaec973612cfdf36c1f5401
Source7: http://download.go-oo.org/%{mws}/%{tag}-impress.tar.bz2
-# Source7-md5: 00a1646d1913989bc432073f8954c92b
+# Source7-md5: b214862e9b937bd0f6ab7130b5163188
Source8: http://download.go-oo.org/%{mws}/%{tag}-artwork.tar.bz2
-# Source8-md5: cc928a9c348121d82fb80c43dbf3901f
+# Source8-md5: b3b6a4c16c60d3de7a8e012bc423a3c4
Source9: http://download.go-oo.org/%{mws}/%{tag}-filters.tar.bz2
-# Source9-md5: 729550f40870eeaa94b2ae493e038848
+# Source9-md5: 1f819d3885b3d08da050d22e0697c907
Source10: http://download.go-oo.org/%{mws}/%{tag}-testing.tar.bz2
-# Source10-md5: 406087778a00ad68cc4e94aa5a677086
+# Source10-md5: 8b5bf9ca8ac82af3d98b8afd4c55d6a6
Source11: http://download.go-oo.org/%{mws}/%{tag}-bootstrap.tar.bz2
-# Source11-md5: 6d680f8bfe532bb8833a0e6bb6d19cc9
-Source12: http://download.go-oo.org/%{mws}/%{tag}-libs_gui.tar.bz2
-# Source12-md5: e23ba759d82041c665a24ea4ef3d8b9b
-Source13: http://download.go-oo.org/%{mws}/%{tag}-libs_core.tar.bz2
-# Source13-md5: bdd173a94ece251126ae0e4120cbb661
-Source14: http://download.go-oo.org/%{mws}/%{tag}-libs_extern.tar.bz2
-# Source14-md5: 2582ddfe11a64cca9190a046e9a159df
+# Source11-md5: 9f1b6875932aaad757f0a1e358353f04
+Source12: http://download.go-oo.org/%{mws}/%{tag}-libs-gui.tar.bz2
+# Source12-md5: 48266d60c39667a180f6c572553adb87
+Source13: http://download.go-oo.org/%{mws}/%{tag}-libs-core.tar.bz2
+# Source13-md5: 36f2c1da3b3a5c4a2475dee66ba07bec
+Source14: http://download.go-oo.org/%{mws}/%{tag}-libs-extern.tar.bz2
+# Source14-md5: bb9ff9b892512510bd24606c5767b41d
Source15: http://download.go-oo.org/%{mws}/%{tag}-components.tar.bz2
-# Source15-md5: d29035a293298c6e69d5d8a3acbab75f
-Source16: http://download.go-oo.org/%{mws}/%{tag}-libs_extern_sys.tar.bz2
-# Source16-md5: 8016fc38320ebd4ab7720df7eb4e4df0
+# Source15-md5: f67696f26353d43a1868b625a51a46be
+Source16: http://download.go-oo.org/%{mws}/%{tag}-libs-extern-sys.tar.bz2
+# Source16-md5: 5ee043a08c0f5e352654ed8aed9a4d35
Source17: http://download.go-oo.org/%{mws}/%{tag}-extensions.tar.bz2
-# Source17-md5: f307de1b92d488484a53fa8ce45a7b3b
+# Source17-md5: 013a874ed0b18f293f68e8f5e1a22441
Source18: http://download.go-oo.org/%{mws}/%{tag}-sdk.tar.bz2
-# Source18-md5: f298e95232efdd4182345c095a497799
+# Source18-md5: d3ee9ccd3659d2e49e41853978b48d56
Source19: http://download.go-oo.org/%{mws}/%{tag}-postprocess.tar.bz2
-# Source19-md5: 73b6c538639310c2ad242d6cb5045c52
+# Source19-md5: 1d7d89875ec93d5235891f24eb4d27fd
+Source20: http://download.go-oo.org/%{mws}/%{tag}-help.tar.bz2
+# Source20-md5: db06182f82522fd1213b6a1466b1f7af
+Source21: http://download.go-oo.org/%{mws}/%{tag}-l10n.tar.bz2
+# Source21-md5: 8d802f5cfe1feacbe3ae6ccd941f1543
+Source22: ooo_oxygen_images-2009-06-17.tar.gz
+# Source22-md5: 0b3ffc43231c525db1798495a6676902
Source50: http://download.go-oo.org//DEV300/scsolver.2008-10-30.tar.bz2
# Source50-md5: 04181e5ef82973eb349d3122a19d2274
Source51: http://download.go-oo.org/SRC/biblio.tar.bz2
@@ -290,7 +296,7 @@
%define _noautostrip .*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
%define _noautochrpath .*\\(%{_datadir}\\|%{_libdir}/%{name}/basis*/program/resource\\)/.*
-%define ooobasisdir %{_libdir}/%{name}/basis3.0
+%define ooobasisdir %{_libdir}/%{name}/basis3.2
%description
OpenOffice.org is an open-source project sponsored by Sun Microsystems
@@ -2113,6 +2119,8 @@
%prep
%setup -q -n ooo-build
+%patch0 -p1
+
install -d src
# sources, icons, KDE_icons. You can verify that all needed sources
@@ -2121,17 +2129,17 @@
%{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
%{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
%{SOURCE13} %{SOURCE14} %{SOURCE15} %{SOURCE16} \
- %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE50} \
+ %{SOURCE17} %{SOURCE18} %{SOURCE19} %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE50} \
%{SOURCE51} %{SOURCE52} \
src
-%patch2001 -p1
+#%patch2001 -p1
# fixes
-ln -s %{PATCH104} patches/hotfixes/%{basename:%{PATCH104}}.diff
-ln -s %{PATCH2002} patches/hotfixes/%{basename:%{PATCH2002}}.diff
-ln -s %{PATCH2003} patches/hotfixes/%{basename:%{PATCH2003}}.diff
-ln -s %{PATCH2004} patches/hotfixes/%{basename:%{PATCH2004}}.diff
+#ln -s %{PATCH104} patches/hotfixes/%{basename:%{PATCH104}}.diff
+#ln -s %{PATCH2002} patches/hotfixes/%{basename:%{PATCH2002}}.diff
+#ln -s %{PATCH2003} patches/hotfixes/%{basename:%{PATCH2003}}.diff
+#ln -s %{PATCH2004} patches/hotfixes/%{basename:%{PATCH2004}}.diff
%build
# Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -2194,6 +2202,11 @@
serializer_jar=%{_javadir}/xalan.jar
fi
+# %{?with_system_xalan:--with-system-xalan --with-xalan-jar=%{_javadir}/xalan.jar --with-serializer-jar=$serializer_jar} \
+# %{?with_system_xerces:--with-system-xerces} \
+# %{?with_system_xml_apis:--with-system-xml-apis} \
+# %{?with_system_xt:--with-system-xt --with-xt-jar=%{_javadir}/classes} \
+
CONFOPTS="\
%ifarch %{ix86} \
--with-arch=x86 \
@@ -2218,10 +2231,6 @@
%{?with_system_libhnj:--with-system-altlinuxhyphen} \
%{?with_msaccess:%{?with_system_mdbtools:--with-system-mdbtools}} \
%{?with_system_myspell:--with-system-myspell} \
- %{?with_system_xalan:--with-system-xalan --with-xalan-jar=%{_javadir}/xalan.jar --with-serializer-jar=$serializer_jar} \
- %{?with_system_xerces:--with-system-xerces} \
- %{?with_system_xml_apis:--with-system-xml-apis} \
- %{?with_system_xt:--with-system-xt --with-xt-jar=%{_javadir}/classes} \
--with-system-boost \
--with-system-cairo \
--with-system-curl \
@@ -2257,7 +2266,7 @@
--with-system-xrender-headers=yes \
--with-system-zlib \
%if %{with mozilla}
- --with-system-mozilla=xulrunner \
+ --with-system-mozilla=libxul \
%else
--disable-mozilla \
%endif
@@ -2266,7 +2275,8 @@
--with-about-bitmaps="\$SRCDIR/openabout_pld.bmp" \
--with-distro="${DISTRO}" \
--enable-gtk \
- --%{!?with_kde:dis}%{?with_kde:en}able-kde \
+ --disable-kde \
+ --%{!?with_kde:dis}%{?with_kde:en}able-kde4 \
--without-binsuffix \
--with-installed-ooo-dirname=%{name} \
--with-lang=%{?with_i18n:ALL} \
@@ -2281,6 +2291,7 @@
--enable-gnome-vfs \
%else
--disable-gnome-vfs \
+ --enable-gio \
%endif
--with-docdir=%{_docdir}/%{name}-%{version} \
--with-python=%{__python} \
@@ -2290,9 +2301,6 @@
--without-gpc \
--disable-epm \
--disable-fontooo \
- --disable-strip \
- --enable-openxml \
- --enable-atkbridge \
--%{?with_msaccess:en}%{!?with_msaccess:dis}able-access \
--enable-cairo \
--enable-crypt-link \
@@ -2300,14 +2308,7 @@
--%{?with_mono:en}%{!?with_mono:dis}able-mono \
--enable-pam-link \
--enable-opengl \
- --enable-openldap \
- --enable-openxml \
- --enable-cups \
- --enable-fontconfig \
- --enable-libsn \
- --enable-libart \
- --enable-lockdown \
- --enable-sdext \
+ --with-openldap \
--disable-rpath \
%if 0%{?debug:1}
--enable-debug \
@@ -2325,11 +2326,17 @@
--enable-split-app-modules \
--enable-split-opt-features \
--disable-access \
+ --without-git \
--enable-minimizer \
- --enable-presenter-console \
- --enable-pdfimport
+ --disable-presenter-console \
+ --enable-pdfimport \
+ --enable-cups \
+ --enable-fontconfig \
+ --enable-lockdown \
+ --disable-layout
"
+
# build-ooo script will pickup these
export CONFIGURE_OPTIONS="$CONFOPTS"
@@ -2750,6 +2757,7 @@
%{ooobasisdir}/presets/config/cmyk.soc
%{ooobasisdir}/presets/config/gallery.soc
%{ooobasisdir}/presets/config/html.soc
+%{ooobasisdir}/presets/config/scribus.soc
%{ooobasisdir}/presets/config/standard.so?
%{ooobasisdir}/presets/config/sun-color.soc
%{ooobasisdir}/presets/config/web.soc
@@ -2826,15 +2834,17 @@
%attr(755,root,root) %{ooobasisdir}/program/libdbtoolsl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libdbul[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libdeploymentmiscl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libdesktop_detectorl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libdict_ja.so
%attr(755,root,root) %{ooobasisdir}/program/libdict_zh.so
-%attr(755,root,root) %{ooobasisdir}/program/libdtransX11l[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libdrawinglayerl[ipx].so
+###%attr(755,root,root) %{ooobasisdir}/program/libdtransX11l[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libeggtrayl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libegil[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libembobj.so
%attr(755,root,root) %{ooobasisdir}/program/libemboleobj.so
%attr(755,root,root) %{ooobasisdir}/program/libemel[ipx].so
-%attr(755,root,root) %{ooobasisdir}/program/libempl[ipx].so
+###%attr(755,root,root) %{ooobasisdir}/program/libempl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libepbl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libepgl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libeppl[ipx].so
@@ -2842,7 +2852,6 @@
%attr(755,root,root) %{ooobasisdir}/program/libeptl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/liberal[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libetil[ipx].so
-%attr(755,root,root) %{ooobasisdir}/program/libevoab1.so
%attr(755,root,root) %{ooobasisdir}/program/libevtatt.so
%attr(755,root,root) %{ooobasisdir}/program/libexlinkl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libexpl[ipx].so
@@ -2850,6 +2859,8 @@
%attr(755,root,root) %{ooobasisdir}/program/libfilel[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libfilterconfig1.so
%attr(755,root,root) %{ooobasisdir}/program/libflatl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libforl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libforuil[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libfrml[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libfwel[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libfwil[ipx].so
@@ -2862,6 +2873,7 @@
%{!?with_system_hunspell:%attr(755,root,root) %{ooobasisdir}/program/libhunspell.so}
%attr(755,root,root) %{ooobasisdir}/program/libhyphenl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libi18nisolang1gcc3.so
+%attr(755,root,root) %{ooobasisdir}/program/libi18npaperl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libi18nregexpgcc3.so
%attr(755,root,root) %{ooobasisdir}/program/libi18nutilgcc3.so
%attr(755,root,root) %{ooobasisdir}/program/libicdl[ipx].so
@@ -2877,7 +2889,7 @@
%attr(755,root,root) %{ooobasisdir}/program/libiral[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libitgl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libitil[ipx].so
-%attr(755,root,root) %{ooobasisdir}/program/libjl*_g.so
+###%attr(755,root,root) %{ooobasisdir}/program/libjl*_g.so
%attr(755,root,root) %{ooobasisdir}/program/liblegacy_binfiltersl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/liblngl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/liblnthl[ipx].so
@@ -2888,9 +2900,10 @@
%attr(755,root,root) %{ooobasisdir}/program/liblogl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libmcnttype.so
%attr(755,root,root) %{ooobasisdir}/program/libmozbootstrap.so
-%attr(755,root,root) %{ooobasisdir}/program/libmysql2.so
-%attr(755,root,root) %{ooobasisdir}/program/libodbc2.so
-%attr(755,root,root) %{ooobasisdir}/program/libodbcbase2.so
+%attr(755,root,root) %{ooobasisdir}/program/libmsformsl[ipx].uno.so
+%attr(755,root,root) %{ooobasisdir}/program/libmysqll[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libodbcl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libodbcbasel[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/liboffaccl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/liboooimprovecorel[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libooxl[ipx].so
@@ -2898,9 +2911,10 @@
%attr(755,root,root) %{ooobasisdir}/program/libpcrl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libpdffilterl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libpll[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libpptxl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libpreloadl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libprotocolhandlerl[ipx].so
-%attr(755,root,root) %{ooobasisdir}/program/libpspl[ipx].so
+###%attr(755,root,root) %{ooobasisdir}/program/libpspl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libqstart_gtkl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/librecentfile.so
%attr(755,root,root) %{ooobasisdir}/program/libresl[ipx].so
@@ -2911,6 +2925,7 @@
%attr(755,root,root) %{ooobasisdir}/program/libsdbc2.so
%attr(755,root,root) %{ooobasisdir}/program/libsdbtl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsddl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libsdfiltl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsdl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsduil[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsfxl[ipx].so
@@ -2924,6 +2939,8 @@
%attr(755,root,root) %{ooobasisdir}/program/libstsl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsvll[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsvtl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libsvxcorel[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libsvxmsfilterl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libsvxl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libswl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libtextcat.so
@@ -2947,6 +2964,8 @@
%attr(755,root,root) %{ooobasisdir}/program/libupdchkl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libutll[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libuuil[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libvbahelperl[ipx].so
+%attr(755,root,root) %{ooobasisdir}/program/libvbaswobjl[ipx].uno.so
%attr(755,root,root) %{ooobasisdir}/program/libvcll[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libvclplug_genl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libvclplug_svpl[ipx].so
@@ -2956,7 +2975,7 @@
%attr(755,root,root) %{ooobasisdir}/program/libxmlfdl[ipx].so
## maybe external is possible?
# - external broken in 3.0.1
-%attr(755,root,root) %{ooobasisdir}/program/libxmlsec1*.so
+###%attr(755,root,root) %{ooobasisdir}/program/libxmlsec1*.so
##
%attr(755,root,root) %{ooobasisdir}/program/libxmlsecurity.so
%attr(755,root,root) %{ooobasisdir}/program/libxmxl[ipx].so
@@ -2980,12 +2999,12 @@
##
%attr(755,root,root) %{ooobasisdir}/program/sax.uno.so
%attr(755,root,root) %{ooobasisdir}/program/senddoc
-%attr(755,root,root) %{ooobasisdir}/program/setofficelang
-%attr(755,root,root) %{ooobasisdir}/program/setofficelang.bin
+###%attr(755,root,root) %{ooobasisdir}/program/setofficelang
+###%attr(755,root,root) %{ooobasisdir}/program/setofficelang.bin
%attr(755,root,root) %{ooobasisdir}/program/simplecanvas.uno.so
%attr(755,root,root) %{ooobasisdir}/program/slideshow.uno.so
%attr(755,root,root) %{ooobasisdir}/program/spadmin.bin
-%attr(755,root,root) %{ooobasisdir}/program/stocservices.uno.so
+###%attr(755,root,root) %{ooobasisdir}/program/stocservices.uno.so
%attr(755,root,root) %{ooobasisdir}/program/stringresource*.uno.so
%attr(755,root,root) %{ooobasisdir}/program/svtmisc.uno.so
%attr(755,root,root) %{ooobasisdir}/program/sysmgr1.uno.so
@@ -2997,11 +3016,11 @@
%attr(755,root,root) %{ooobasisdir}/program/vbaevents*.uno.so
%attr(755,root,root) %{ooobasisdir}/program/vclcanvas.uno.so
# versioned libraries and their symlinks
-%attr(755,root,root) %{ooobasisdir}/program/*.so.*
+###%attr(755,root,root) %{ooobasisdir}/program/*.so.*
%if %{with java}
-%attr(755,root,root) %{ooobasisdir}/program/libhsqldb2.so
-%attr(755,root,root) %{ooobasisdir}/program/libjdbc2.so
+%attr(755,root,root) %{ooobasisdir}/program/libhsqldb.so
+%attr(755,root,root) %{ooobasisdir}/program/libjdbcl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libofficebean.so
%endif
@@ -3039,13 +3058,13 @@
%{ooobasisdir}/program/classes/XSLTFilter.jar
%{ooobasisdir}/program/classes/XSLTValidate.jar
%{ooobasisdir}/program/classes/agenda.jar
-%{ooobasisdir}/program/classes/classes.jar
+###%{ooobasisdir}/program/classes/classes.jar
%{ooobasisdir}/program/classes/commonwizards.jar
%{ooobasisdir}/program/classes/fax.jar
%{ooobasisdir}/program/classes/form.jar
%{!?with_system_hsqldb:%{ooobasisdir}/program/classes/hsqldb.jar}
%{ooobasisdir}/program/classes/js.jar
-%{ooobasisdir}/program/classes/jut.jar
+###%{ooobasisdir}/program/classes/jut.jar
%{ooobasisdir}/program/classes/letter.jar
%{ooobasisdir}/program/classes/lucene-analyzers-2.3.jar
%{ooobasisdir}/program/classes/lucene-core-2.3.jar
@@ -3092,6 +3111,8 @@
%{ooobasisdir}/program/resource/epsen-US.res
%{ooobasisdir}/program/resource/epten-US.res
%{ooobasisdir}/program/resource/euren-US.res
+%{ooobasisdir}/program/resource/foren-US.res
+%{ooobasisdir}/program/resource/foruien-US.res
%{ooobasisdir}/program/resource/fps_officeen-US.res
%{ooobasisdir}/program/resource/frmen-US.res
%{ooobasisdir}/program/resource/fween-US.res
@@ -3143,6 +3164,7 @@
%{ooobasisdir}/share/config/images_crystal.zip
%{ooobasisdir}/share/config/images_hicontrast.zip
%{ooobasisdir}/share/config/images_industrial.zip
+%{ooobasisdir}/share/config/images_oxygen.zip
%{ooobasisdir}/share/config/images_tango.zip
%{ooobasisdir}/share/config/javasettingsunopkginstall.xml
%{ooobasisdir}/share/config/*.xpm
@@ -3165,7 +3187,7 @@
%dir %{ooobasisdir}/share/config/soffice.cfg/modules/scalc/accelerator
%{ooobasisdir}/share/config/soffice.cfg/modules/schart
%dir %{ooobasisdir}/share/config/soffice.cfg/modules/sdraw
-%dir %{ooobasisdir}/share/config/soffice.cfg/modules/sdraw/accelerator
+###%dir %{ooobasisdir}/share/config/soffice.cfg/modules/sdraw/accelerator
%dir %{ooobasisdir}/share/config/soffice.cfg/modules/sglobal
%dir %{ooobasisdir}/share/config/soffice.cfg/modules/sglobal/accelerator
%{ooobasisdir}/share/config/soffice.cfg/modules/sglobal/accelerator/en-US
@@ -3216,14 +3238,16 @@
%{ooobasisdir}/share/registry/data/org/openoffice/UserProfile.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/VCL.xcu
%dir %{ooobasisdir}/share/registry/data/org/openoffice/Office
+%{ooobasisdir}/share/registry/data/org/openoffice/Office/Accelerators.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Calc.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Canvas.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Common.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/DataAccess.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Embedding.xcu
-%{ooobasisdir}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+###%{ooobasisdir}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/ExtensionManager.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/FormWizard.xcu
+%{ooobasisdir}/share/registry/data/org/openoffice/Office/Histories.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Impress.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Jobs.xcu
%{ooobasisdir}/share/registry/data/org/openoffice/Office/Labels.xcu
@@ -3271,15 +3295,30 @@
%dir %{ooobasisdir}/share/registry/modules/org
%dir %{ooobasisdir}/share/registry/modules/org/openoffice
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office
+%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Accelerators
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Accelerators/Accelerators-unxwnt.xcu
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Common
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess
+%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/adabas.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/calc.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/dbase.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/evoab2.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/flat.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/hsqldb.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/jdbc.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/mysql.xcu
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/DataAccess/Drivers/odbc.xcu
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Embedding
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-chart.xcu
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Linguistic
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-spellchecker.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-thesaurus.xcu
+%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Paths
+%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Paths/Paths-unxwnt.xcu
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Scripting
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Office/Writer
%dir %{ooobasisdir}/share/registry/modules/org/openoffice/Setup
@@ -3321,6 +3360,7 @@
%{ooobasisdir}/share/registry/schema/org/openoffice/UserProfile.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/VCL.xcs
%dir %{ooobasisdir}/share/registry/schema/org/openoffice/Office
+%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Accelerators.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Addons.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Calc.xcs
@@ -3336,6 +3376,7 @@
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/ExtensionManager.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/FormWizard.xcs
+%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Histories.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Impress.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Java.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Jobs.xcs
@@ -3359,6 +3400,10 @@
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/WebWizard.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/WriterWeb.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/Writer.xcs
+%dir %{ooobasisdir}/share/registry/schema/org/openoffice/Office/DataAccess
+%{ooobasisdir}/share/registry/schema/org/openoffice/Office/DataAccess/Drivers.xcs
+%dir %{ooobasisdir}/share/registry/schema/org/openoffice/Office/OOoImprovement
+%{ooobasisdir}/share/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
%dir %{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
@@ -3384,6 +3429,7 @@
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
+%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/WindowState.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
@@ -3397,6 +3443,7 @@
%dir %{ooobasisdir}/share/registry/schema/org/openoffice/ucb
%{ooobasisdir}/share/registry/schema/org/openoffice/ucb/Configuration.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/ucb/Hierarchy.xcs
+%{ooobasisdir}/share/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
%{ooobasisdir}/share/registry/schema/org/openoffice/ucb/Store.xcs
%dir %{ooobasisdir}/share/samples
@@ -3516,18 +3563,18 @@
%files libs-gtk
%defattr(644,root,root,755)
%attr(755,root,root) %{ooobasisdir}/program/fps_gnome.uno.so
+%attr(755,root,root) %{ooobasisdir}/program/gconfbe1.uno.so
%attr(755,root,root) %{ooobasisdir}/program/gnome-open-url
%attr(755,root,root) %{ooobasisdir}/program/gnome-open-url.bin
-%attr(755,root,root) %{ooobasisdir}/program/libevoab2.so
+%attr(755,root,root) %{ooobasisdir}/program/libevoabl[ipx].so
%attr(755,root,root) %{ooobasisdir}/program/libvclplug_gtk*.so
%if %{with gnomevfs}
-%attr(755,root,root) %{ooobasisdir}/program/gconfbe1.uno.so
%attr(755,root,root) %{ooobasisdir}/program/ucpgvfs1.uno.so
+%else
+%attr(755,root,root) %{ooobasisdir}/program/ucpgio1.uno.so
%endif
-## GIO files
-#%attr(755,root,root) %{ooobasisdir}/program/ucpgio1.uno.so
-#%{ooobasisdir}/share/registry/modules/org/openoffice/ucb/Configuration/Configuration-gio.xcu
-##
+%dir %{ooobasisdir}/share/registry/modules/org/openoffice/ucb/Configuration
+%{ooobasisdir}/share/registry/modules/org/openoffice/ucb/Configuration/Configuration-gio.xcu
%files base
%defattr(644,root,root,755)
@@ -3571,18 +3618,18 @@
%{ooobasisdir}/share/config/soffice.cfg/modules/dbtdata/accelerator/en-US
%{ooobasisdir}/share/config/soffice.cfg/modules/dbtdata/menubar
%{ooobasisdir}/share/config/soffice.cfg/modules/dbtdata/toolbar
-%{ooobasisdir}/share/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
-%{ooobasisdir}/share/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
+###%{ooobasisdir}/share/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+###%{ooobasisdir}/share/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
-%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-report.xcu
+###%{ooobasisdir}/share/registry/modules/org/openoffice/Office/Embedding/Embedding-report.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
-%{ooobasisdir}/share/registry/modules/org/openoffice/Setup/Setup-report.xcu
+###%{ooobasisdir}/share/registry/modules/org/openoffice/Setup/Setup-report.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
%{ooobasisdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
-%{ooobasisdir}/share/registry/schema/org/openoffice/Office/ReportDesign.xcs
-%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
-%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
+###%{ooobasisdir}/share/registry/schema/org/openoffice/Office/ReportDesign.xcs
+###%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
+###%{ooobasisdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
%{ooobasisdir}/help/en/sdatabase.*
%files calc
@@ -3599,10 +3646,12 @@
%attr(755,root,root) %{ooobasisdir}/program/libdatel[ipx].so
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.843&r2=1.843.2.1&f=u
More information about the pld-cvs-commit
mailing list