[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/FC-4 .cvsignore, 1.49, 1.50 openoffice.org.spec, 1.204, 1.205 sources, 1.73, 1.74



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32734

Modified Files:
	.cvsignore openoffice.org.spec sources 
Log Message:
prepare an update


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/.cvsignore,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- .cvsignore	28 Jun 2005 11:28:49 -0000	1.49
+++ .cvsignore	14 Jul 2005 08:10:29 -0000	1.50
@@ -107,3 +107,4 @@
 openoffice.org-simple-crash_report.sh
 SRC680_m112.tar.bz2
 hsqldb_1_8_0.zip
+SRC680_m117.tar.bz2


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- openoffice.org.spec	28 Jun 2005 11:28:49 -0000	1.204
+++ openoffice.org.spec	14 Jul 2005 08:10:29 -0000	1.205
@@ -1,4 +1,4 @@
-%define ooo2ver 112
+%define ooo2ver 117
 %define ooo_rpm_release 1
 %define build_fc4 1
 %define build_fc5 0
@@ -23,9 +23,12 @@
 
 %if %{build_fc4}
 %define release_extension .1.0.fc4
+%define extraflags = --without-system-xmlsec
 %endif
 %if %{build_fc5}
 %define release_extension .2.0.fc5
+#%define extraflags = --with-system-xmlsec --without-stlport4
+%define extraflags = --with-system-xmlsec
 %endif
 
 ExclusiveArch:  %{ix86} ppc
@@ -41,15 +44,8 @@
 Source:		SRC680_m%{ooo2ver}.tar.bz2
 Source1:	openoffice.org-jakubicons.tar.gz
 Source2:	openoffice.org-myspell-contrib.tar.gz
-Source3:	GSI_gu-IN.sdf
-Source4:	GSI_ta-IN.sdf
-Source5:	GSI_pa-IN.sdf
-Source6:	GSI_nn.sdf
-Source7:	GSI_nb.sdf
-Source8:	GSI_ru.sdf
-Source9:	GSI_bn.sdf
-Source10:	openoffice.org-simple-crash_report.sh
-Source11:	hsqldb_1_8_0.zip
+Source3:	GSI_ta-IN.sdf
+Source4:	openoffice.org-simple-crash_report.sh
 BuildRequires: 	perl, sed, zip, bzip2, unzip, tar, findutils
 BuildRequires: 	autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
 BuildRequires: 	gcc >= %{gccver}, gcc-c++ >= %{gccver}, binutils
@@ -65,7 +61,10 @@
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
 BuildRequires: 	libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
 BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, tcsh
-BuildRequires:	perl-Archive-Zip, evolution-data-server-devel
+BuildRequires:	perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
+%if %{build_fc5}
+BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
+%endif
 
 Patch0:  openoffice.org-1.9.80.NONE.skipuselessmodules.patch
 Patch1:  openoffice.org-1.9.71s1.noregisterwizard.patch
@@ -77,46 +76,60 @@
 Patch7:  openoffice.org-1.9.84.ooo45162.svxcasting2.patch
 Patch8:  openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch9:  openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch10: openoffice.org-1.9.87.rh151357.patch
+Patch10: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
 Patch11: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
 Patch12: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
 Patch13: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch14: openoffice.org-1.9.89.oooXXXXX.parallel.sysui.patch
+Patch14: openoffice.org-1.9.89.ooo51873.parallel.sysui.patch
 Patch15: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
 Patch16: openoffice.org-1.9.89.oooXXXXX.upstreamhatesthefp.officecfg.patch
 Patch17: openoffice.org-1.9.89.rh152269.nfs.desktop.patch
-#Patch18: openoffice.org-1.9.89.gccXXXXX.hsqldbproblems.hsqldb.patch
-Patch19: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
-Patch20: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
-Patch21: openoffice.org-1.9.92.oooXXXXX.addindic.patch
-Patch22: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-Patch23: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch24: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch25: openoffice.org-1.9.97.rh156067.noversionedicons.patch
-Patch26: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
-Patch28: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-Patch29: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
-Patch30: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
-Patch31: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch32: workspace-fpicker4.patch
-Patch33: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch34: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch35: workspace.vcl39.patch
-Patch36: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
-Patch37: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch38: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch39: workspace.gslpatches2.patch
-Patch40: openoffice.org-1.9.108.oooXXXXX.pyuno.pushrpath.patch
-Patch41: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch42: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch43: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
-Patch44: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
-Patch45: hsqldb.fix1.patch
-Patch46: hsqldb.fix2.patch
-Patch47: openoffice.org-1.9.112.oooXXXXX.testtools.patch
-Patch48: openoffice.org-1.9.112.ooo51139.vcltmp.patch
-Patch49: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch18: openoffice.org-1.9.91.oooXXXXX.fontfallbacks.officecfg.patch
+Patch19: openoffice.org-1.9.90.ooo46585.sunmiscisnotstandard.filter.patch
+Patch20: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+Patch21: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch22: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch23: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch24: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
+Patch25: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.filter.patch
+Patch26: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+Patch27: openoffice.org-1.9.99.gcc19870.gcjaccessproblem.wizards.patch
+Patch28: openoffice.org-1.9.104-use-fontconfig-everywhere.patch
+Patch29: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
+Patch30: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch31: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+Patch32: workspace.vcl39.patch
+Patch33: openoffice.org-1.9.108.ooo30133.lingucomponent.ukrainean.patch
+Patch34: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+Patch35: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+Patch36: workspace.gslpatches2.patch
+Patch37: workspace.fpicandrpath.patch
+Patch38: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch39: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch40: openoffice.org-1.9.110.oooXXXXX.psprintfriend.patch
+Patch41: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
+Patch42: openoffice.org-1.9.112.ooo51724.testtools.patch
+Patch43: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
+Patch44: openoffice.org-1.9.113.ooo43430.cvskk.np_sdk.patch
+Patch45: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
+Patch46: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch47: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch48: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
+Patch49: openoffice.org-1.9.114.ooo51638.mailmerge.patch
+#Patch50: openoffice.org-1.9.114.oooXXXXX.nostlport.patch
+Patch51: openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+Patch52: openoffice.org-1.9.115.ooo51735.audio.withoutnas.patch
+Patch53: openoffice.org-1.9.115.ooo51736.xsltproc.evenwithjava.patch
+Patch54: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch55: openoffice.org-1.9.115.ooo51745.cpputools.patch
+Patch56: openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+Patch57: openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+Patch58: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
+Patch59: workspace.impress63.patch
+Patch60: openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch
+Patch61: openoffice.org-1.9.114.oooXXXXX.systemboost.patch
+Patch62: openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+Patch63: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -190,6 +203,7 @@
 Group: Applications/Productivity
 Obsoletes: openoffice.org
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
 Requires: libwpd >= 0.8.0
 
 %description writer
@@ -245,7 +259,7 @@
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
 
 %description xsltfilter
-xsltfilter module for %{name}, provides additional docbook and xhtml export transforms.
+xsltfilter module for %{name}, provides additional docbook and xhtml export transforms. Install this to enable docbook export.
 
 %package javafilter
 Summary: extra javafilter module for %{name}
@@ -705,60 +719,75 @@
 %patch7  -p1 -b .ooo45162.svxcasting2.patch
 %patch8  -p1 -b .usetwodotzeropath.patch
 %patch9  -p1 -b .warnnoterroronmissing.patch
-%patch10 -p1 -b .rh151357.patch
+%patch10 -p1 -b .rh151357.setlangtolocale.patch
 %patch11 -p1 -b .rh133741.alwaysgtk.patch
 %patch12 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
 %patch13 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch14 -p1 -b .oooXXXXX.parallel.sysui.patch
+%patch14 -p1 -b .ooo51873.parallel.sysui.patch
 %patch15 -p1 -b .ooo44027.pthreadchange.patch
 %patch16 -p1 -b .oooXXXXX.upstreamhatesthefp.officecfg.patch
 %patch17 -p1 -b .rh152269.nfs.desktop.patch
-#%patch18 -p1 -b .gccXXXXX.hsqldbproblems.hsqldb.patch
-%patch19 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
-%patch20 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
-%patch21 -p1 -b .oooXXXXX.addindic.patch
-%patch22 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-%patch23 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch24 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch25 -p1 -b .rh156067.noversionedicons.patch
-%patch26 -p1 -b .ooo48600.rtfparseerror.svx.patch
-%patch27 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
-%patch28 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-%patch29 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
-%patch30 -p1 -b .use-fontconfig-everwhere.patch
-%patch31 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch32 -p1 -b .workspace-fpicker4.patch
-%patch33 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch34 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch35 -p1 -b .workspace.vcl39.patch
-%patch36 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
-%patch37 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch38 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch39 -p1 -b .workspace.gslpatches2.patch
-%patch40 -p1 -b .oooXXXXX.pyuno.pushrpath.patch
-%patch41 -p1 -b .NONE.gcc3gcj4.patch
-%patch42 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch43 -p1 -b .oooXXXXX.psprintfriend.patch
-%patch44 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
-%patch45 -p1 -b hsqldb.fix1.patch
-%patch46 -p1 -b hsqldb.fix2.patch
-%patch47 -p1 -b .oooXXXXX.testtools.patch
-%patch48 -p1 -b .ooo51139.vcltmp.patch
-%patch49 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-
+%patch18 -p1 -b .oooXXXXX.fontfallbacks.officecfg.patch
+%patch19 -p1 -b .ooo46585.sunmiscisnotstandard.filter.patch
+%patch20 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
+%patch21 -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch22 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch23 -p1 -b .rh156067.noversionedicons.patch
+%patch24 -p1 -b .ooo48600.rtfparseerror.svx.patch
+%patch25 -p1 -b .gcc19870.gcjaccessproblem.filter.patch
+%patch26 -p1 -b .ooo48610.searchalltemplates.wizards.patch
+%patch27 -p1 -b .gcc19870.gcjaccessproblem.wizards.patch
+%patch28 -p1 -b .use-fontconfig-everwhere.patch
+%patch29 -p1 -b .berkeleydb-jni-casting-misuse.patch
+%patch30 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch31 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
+%patch32 -p1 -b .workspace.vcl39.patch
+%patch33 -p1 -b .ooo30133.lingucomponent.ukrainean.patch
+%patch34 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
+%patch35 -p1 -b .ooo47323.binfilter.stupiddetect.patch
+%patch36 -p1 -b .workspace.gslpatches2.patch
+%patch37 -p1 -b .workspace.fpicandrpath.patch
+%patch38 -p1 -b .NONE.gcc3gcj4.patch
+%patch39 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch40 -p1 -b .oooXXXXX.psprintfriend.patch
+%patch41 -p1 -b .gcc19870.gcjaccessproblem.hsqldb.patch
+%patch42 -p1 -b .ooo51724.testtools.patch
+%patch43 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
+%patch44 -p1 -b .ooo43430.cvskk.np_sdk.patch
+%patch45 -p1 -b .ooo51385.bridges.stack.patch
+%patch46 -p1 -b .ooo51718.rpath.patch
+%patch47 -p1 -b .rh161886.rpath.desktop.patch
+%patch48 -p1 -b .ooo51637.solenv.pyuno.patch
+%patch49 -p1 -b .ooo51638.mailmerge.patch
+#%patch50 -p1 -b .oooXXXXX.nostlport.patch
+%patch51 -p1 -b .ooo51673.printing.checkerror.patch
+%patch52 -p1 -b .ooo51735.audio.withoutnas.patch
+%patch53 -p1 -b .ooo51736.xsltproc.evenwithjava.patch
+%patch54 -p1 -b .ooo51931.systemxmlsec.patch
+%patch55 -p1 -b .ooo51745.cpputools.patch
+%patch56 -p1 -b .ooo51755.scp2.parallel.patch
+%patch57 -p1 -b .ooo51774.rsc.parallel.patch
+%if %{build_fc5}
+%patch58 -p1 -b .oooXXXXX.extensions.evolution.patch
+%endif
+%patch59 -p1 -b .workspace.impress63.patch
+%patch60 -p1 -b .rh162935.gccXXXXX.weirdcrash.patch
+%patch61 -p1 -b .oooXXXXX.systemboost.patch
+%patch62 -p1 -b .rh163147.thorndale.fontconfig.patch
+%patch63 -p1 -b .ooo51912.nullpointer.wizards.patch
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system
-#libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
+#libxmlsec/db4 then this needs to be modified/dropped
 find_provides="%{__find_provides}"
 echo "#!/bin/sh" > find-provides
-echo "$find_provides | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_" >> find-provides
+echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libdb_" >> find-provides
 echo "exit 0" >> find-provides
 chmod +x find-provides
 %define __find_provides %{_builddir}/SRC680_m%{ooo2ver}/find-provides
 
 find_requires="%{__find_requires}"
 echo "#!/bin/sh" > find-requires
-echo "$find_requires | grep -v libxmlsec1 | grep -v libsndfile | grep -v libportaudio | grep -v libdb- | grep -v libdb_ | grep -v \(" >> find-requires
+echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libdb_ | grep -v \(" >> find-requires
 echo "exit 0" >> find-requires
 chmod +x find-requires
 %define __find_requires %{_builddir}/SRC680_m%{ooo2ver}/find-requires
@@ -778,7 +807,7 @@
 fi
 cd config_office
 autoconf
-%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-system-db --without-fonts %{withlang}
+%configure --with-java=%{java_interpreter} --disable-crashdump --disable-epm --enable-libart --enable-symbols --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --enable-evolution2 --enable-xsltproc --disable-fontooo --disable-pasf --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-db --without-fonts --without-nas %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -807,9 +836,6 @@
 #don't duplicate english helpcontent about the place
 unset DEFAULT_TO_ENGLISH_FOR_PACKING
 
-#gcj accessor problem
-cp -f %{SOURCE11} hsqldb/download
-
 %if !%{gcc_is_gcc4}
 #this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
 export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
@@ -819,13 +845,7 @@
 cd transex3/prj
 build --dlv_switch link --all -P$MAXBUILDS
 deliver
-localize -m -x -l gu-IN -f %{SOURCE3}
-localize -m -x -l ta-IN -f %{SOURCE4}
-localize -m -x -l pa-IN -f %{SOURCE5}
-localize -m -x -l nn -f %{SOURCE6}
-localize -m -x -l nb -f %{SOURCE7}
-localize -m -x -l ru -f %{SOURCE8}
-localize -m -x -l ru -f %{SOURCE9}
+localize -m -x -l ta-IN -f %{SOURCE3}
 cd ../..
 cd instsetoo_native/util
 if ! build --dlv_switch link --all -P$MAXBUILDS; then
@@ -881,7 +901,7 @@
 for foo in `find $RPM_BUILD_ROOT/%{instdir}/program -name "*" -exec file {} \;| grep ": ELF" | cut -d: -f 1` ; do
 	chmod +wx $foo
 	ls -asl $foo
-	result=`readelf -d $foo | grep RPATH | grep \\\\[\\$ORIGIN\\\\]` || true
+	result=`readelf -d $foo | grep RPATH | grep \\\\[\\$ORIGIN` || true
         if [ "$result" == "" ]; then
                 echo "RPATH Warning: $foo is b0rked (-rpath missing)"
                 origin=1
@@ -899,12 +919,12 @@
 
 done
 #disabled for now until system-db is done
-#if [ $origin == 1 ]; then false; fi
+if [ $origin == 1 ]; then false; fi
 #if [ $pic == 1 ]; then false; fi
-if [ $executable == 1 ]; then false; fi
+#if [ $executable == 1 ]; then false; fi
 
 #make up some /usr/bin scripts
-cp %{SOURCE10} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
+cp %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
 chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report
 
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -989,6 +1009,7 @@
 %{instdir}/share/registry/res/af
 %dir %{instdir}/share/template
 %{instdir}/share/template/af
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-af.xcu
 
 %files langpack-ar
 %defattr(-,root,root)
@@ -1004,11 +1025,17 @@
 %{instdir}/share/registry/res/ar
 %dir %{instdir}/share/template
 %{instdir}/share/template/ar
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ar.xcu
 
 %files langpack-bg_BG
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/share
+%{instdir}/help/bg
 %{instdir}/program/resource/*680bg.res
 %dir %{instdir}/share/dict
 %dir %{instdir}/share/dict/ooo
@@ -1020,6 +1047,11 @@
 %{instdir}/share/registry/res/bg
 %dir %{instdir}/share/template
 %{instdir}/share/template/bg
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bg.xcu
 
 %files langpack-bn_IN
 %defattr(-,root,root)
@@ -1033,6 +1065,11 @@
 %{instdir}/share/registry/res/bn
 %dir %{instdir}/share/template
 %{instdir}/share/template/bn
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-bn.xcu
 
 %files langpack-ca_ES
 %defattr(-,root,root)
@@ -1049,6 +1086,11 @@
 %{instdir}/share/registry/res/ca
 %dir %{instdir}/share/template
 %{instdir}/share/template/ca
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ca.xcu
 
 %files langpack-cs_CZ
 %defattr(-,root,root)
@@ -1066,6 +1108,11 @@
 %{instdir}/share/registry/res/cs
 %dir %{instdir}/share/template
 %{instdir}/share/template/cs
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-cs.xcu
 
 %files langpack-cy_GB
 %defattr(-,root,root)
@@ -1082,6 +1129,11 @@
 %{instdir}/share/registry/res/cy
 %dir %{instdir}/share/template
 %{instdir}/share/template/cy
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-cy.xcu
 
 %files langpack-da_DK
 %defattr(-,root,root)
@@ -1098,6 +1150,11 @@
 %{instdir}/share/registry/res/da
 %dir %{instdir}/share/template
 %{instdir}/share/template/da
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-da.xcu
 
 %files langpack-de
 %defattr(-,root,root)
@@ -1116,6 +1173,11 @@
 %{instdir}/share/registry/res/de
 %dir %{instdir}/share/template
 %{instdir}/share/template/de
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-de.xcu
 
 %files langpack-el_GR
 %defattr(-,root,root)
@@ -1132,6 +1194,11 @@
 %{instdir}/share/registry/res/el
 %dir %{instdir}/share/template
 %{instdir}/share/template/el
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-el.xcu
 
 %files langpack-es
 %defattr(-,root,root)
@@ -1150,6 +1217,12 @@
 %{instdir}/share/registry/res/es
 %dir %{instdir}/share/template
 %{instdir}/share/template/es
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-es.xcu
+
 
 %files langpack-et_EE
 %defattr(-,root,root)
@@ -1164,6 +1237,11 @@
 %{instdir}/share/registry/res/et
 %dir %{instdir}/share/template
 %{instdir}/share/template/et
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-et.xcu
 
 %files langpack-eu_ES
 %defattr(-,root,root)
@@ -1177,6 +1255,11 @@
 %{instdir}/share/registry/res/eu
 %dir %{instdir}/share/template
 %{instdir}/share/template/eu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-eu.xcu
 
 %files langpack-fi_FI
 %defattr(-,root,root)
@@ -1193,6 +1276,11 @@
 %{instdir}/share/registry/res/fi
 %dir %{instdir}/share/template
 %{instdir}/share/template/fi
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fi.xcu
 
 %files langpack-fr
 %defattr(-,root,root)
@@ -1211,6 +1299,11 @@
 %{instdir}/share/registry/res/fr
 %dir %{instdir}/share/template
 %{instdir}/share/template/fr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu
 
 %files langpack-gl_ES
 %defattr(-,root,root)
@@ -1227,6 +1320,11 @@
 %{instdir}/share/registry/res/gl
 %dir %{instdir}/share/template
 %{instdir}/share/template/gl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gl.xcu
 
 %files langpack-gu_IN
 %defattr(-,root,root)
@@ -1240,6 +1338,11 @@
 %{instdir}/share/registry/res/gu-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/gu-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gu-IN.xcu
 
 %files langpack-pa_IN
 %defattr(-,root,root)
@@ -1253,6 +1356,11 @@
 %{instdir}/share/registry/res/pa-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/pa-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pa-IN.xcu
 
 %files langpack-he_IL
 %defattr(-,root,root)
@@ -1269,6 +1377,11 @@
 %{instdir}/share/registry/res/he
 %dir %{instdir}/share/template
 %{instdir}/share/template/he
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-he.xcu
 
 %files langpack-hi_IN
 %defattr(-,root,root)
@@ -1282,6 +1395,11 @@
 %{instdir}/share/registry/res/hi-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/hi-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hi-IN.xcu
 
 %files langpack-hu_HU
 %defattr(-,root,root)
@@ -1298,6 +1416,11 @@
 %{instdir}/share/registry/res/hu
 %dir %{instdir}/share/template
 %{instdir}/share/template/hu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hu.xcu
 
 %files langpack-hr_HR
 %defattr(-,root,root)
@@ -1314,6 +1437,11 @@
 %{instdir}/share/registry/res/hr
 %dir %{instdir}/share/template
 %{instdir}/share/template/hr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hr.xcu
 
 %files langpack-it
 %defattr(-,root,root)
@@ -1332,6 +1460,11 @@
 %{instdir}/share/registry/res/it
 %dir %{instdir}/share/template
 %{instdir}/share/template/it
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-it.xcu
 
 %files langpack-ja_JP
 %defattr(-,root,root)
@@ -1347,6 +1480,11 @@
 %{instdir}/share/registry/res/ja
 %dir %{instdir}/share/template
 %{instdir}/share/template/ja
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ja.xcu
 
 %files langpack-ko_KR
 %defattr(-,root,root)
@@ -1362,6 +1500,11 @@
 %{instdir}/share/registry/res/ko
 %dir %{instdir}/share/template
 %{instdir}/share/template/ko
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ko.xcu
 
 %files langpack-lt_LT
 %defattr(-,root,root)
@@ -1378,6 +1521,11 @@
 %{instdir}/share/registry/res/lt
 %dir %{instdir}/share/template
 %{instdir}/share/template/lt
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-lt.xcu
 
 %files langpack-ms_MY
 %defattr(-,root,root)
@@ -1394,6 +1542,11 @@
 %{instdir}/share/registry/res/ms
 %dir %{instdir}/share/template
 %{instdir}/share/template/ms
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ms.xcu
 
 %files langpack-nb_NO
 %defattr(-,root,root)
@@ -1410,6 +1563,11 @@
 %{instdir}/share/registry/res/nb
 %dir %{instdir}/share/template
 %{instdir}/share/template/nb
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nb.xcu
 
 %files langpack-nl
 %defattr(-,root,root)
@@ -1428,6 +1586,11 @@
 %{instdir}/share/registry/res/nl
 %dir %{instdir}/share/template
 %{instdir}/share/template/nl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nl.xcu
 
 %files langpack-nn_NO
 %defattr(-,root,root)
@@ -1444,6 +1607,11 @@
 %{instdir}/share/registry/res/nn
 %dir %{instdir}/share/template
 %{instdir}/share/template/nn
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-nn.xcu
 
 %files langpack-pl_PL
 %defattr(-,root,root)
@@ -1460,6 +1628,11 @@
 %{instdir}/share/registry/res/pl
 %dir %{instdir}/share/template
 %{instdir}/share/template/pl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pl.xcu
 
 %files langpack-pt_PT
 %defattr(-,root,root)
@@ -1478,6 +1651,11 @@
 %{instdir}/share/registry/res/pt
 %dir %{instdir}/share/template
 %{instdir}/share/template/pt
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pt.xcu
 
 %files langpack-pt_BR
 %defattr(-,root,root)
@@ -1496,6 +1674,11 @@
 %{instdir}/share/registry/res/pt-BR
 %dir %{instdir}/share/template
 %{instdir}/share/template/pt-BR
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pt-BR.xcu
 
 %files langpack-ru
 %defattr(-,root,root)
@@ -1512,6 +1695,11 @@
 %{instdir}/share/registry/res/ru
 %dir %{instdir}/share/template
 %{instdir}/share/template/ru
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ru.xcu
 
 %files langpack-sk_SK
 %defattr(-,root,root)
@@ -1528,6 +1716,11 @@
 %{instdir}/share/registry/res/sk
 %dir %{instdir}/share/template
 %{instdir}/share/template/sk
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sk.xcu
 
 %files langpack-sl_SI
 %defattr(-,root,root)
@@ -1544,6 +1737,11 @@
 %{instdir}/share/registry/res/sl
 %dir %{instdir}/share/template
 %{instdir}/share/template/sl
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu
 
 %files langpack-sv
 %defattr(-,root,root)
@@ -1562,6 +1760,11 @@
 %{instdir}/share/registry/res/sv
 %dir %{instdir}/share/template
 %{instdir}/share/template/sv
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sv.xcu
 
 %files langpack-ta_IN
 %defattr(-,root,root)
@@ -1575,6 +1778,11 @@
 %{instdir}/share/registry/res/ta-IN
 %dir %{instdir}/share/template
 %{instdir}/share/template/ta-IN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ta-IN.xcu
 
 %files langpack-th_TH
 %defattr(-,root,root)
@@ -1588,6 +1796,11 @@
 %{instdir}/share/registry/res/th
 %dir %{instdir}/share/template
 %{instdir}/share/template/th
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-th.xcu
 
 %files langpack-tr_TR
 %defattr(-,root,root)
@@ -1601,6 +1814,11 @@
 %{instdir}/share/registry/res/tr
 %dir %{instdir}/share/template
 %{instdir}/share/template/tr
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-tr.xcu
 
 %files langpack-zh_CN
 %defattr(-,root,root)
@@ -1616,6 +1834,11 @@
 %{instdir}/share/registry/res/zh-CN
 %dir %{instdir}/share/template
 %{instdir}/share/template/zh-CN
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
 
 %files langpack-zh_TW
 %defattr(-,root,root)
@@ -1631,6 +1854,11 @@
 %{instdir}/share/registry/res/zh-TW
 %dir %{instdir}/share/template
 %{instdir}/share/template/zh-TW
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
 
 %files langpack-zu_ZA
 %defattr(-,root,root)
@@ -1647,6 +1875,11 @@
 %{instdir}/share/registry/res/zu
 %dir %{instdir}/share/template
 %{instdir}/share/template/zu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zu.xcu
 
 %endif
 
@@ -1669,7 +1902,6 @@
 %{instdir}/help/en/sbasic.*
 %{instdir}/help/en/schart.*
 %{instdir}/help/en/shared.*
-%{instdir}/help/en/sdatabase.*
 %{instdir}/help/main_transform.xsl
 %{instdir}/presets
 %dir %{instdir}/program
@@ -1774,7 +2006,6 @@
 %{instdir}/program/libbindet680*.so
 %{instdir}/program/libcached1.so
 %{instdir}/program/libcanvastools680*.so
-%{instdir}/program/libcommuni680*.so
 %{instdir}/program/libcomphelp4gcc3.so
 %{instdir}/program/libcppcanvas680*.so
 %{instdir}/program/libcppu.so
@@ -1828,9 +2059,6 @@
 %{instdir}/program/libitg680*.so
 %{instdir}/program/libiti680*.so
 %{instdir}/program/libofficebean.so
-%{instdir}/program/libportaudio.so*
-%{instdir}/program/libsimplecm680*.so
-%{instdir}/program/libsndfile.so*
 %{instdir}/program/libfile680*.so
 %{instdir}/program/libfileacc.so
 %{instdir}/program/libfilterconfig1.so
@@ -1916,7 +2144,6 @@
 %{instdir}/program/libspell680*.so
 %{instdir}/program/libspl680*.so
 %{instdir}/program/libsrtrs1.so
-%{instdir}/program/libstlport_gcc.so
 %{instdir}/program/libstore.so
 %{instdir}/program/libstore.so.3
 %{instdir}/program/libsts680*.so
@@ -1952,11 +2179,16 @@
 %{instdir}/program/libvcl680*.so
 %{instdir}/program/libvclplug_*680*.so
 %{instdir}/program/libvos3gcc3.so
-%{instdir}/program/libwpft680*.so
 %{instdir}/program/libxcr680*.so
 %{instdir}/program/libxmlfa680*.so
 %{instdir}/program/libxmlfd680*.so
+%if %{build_fc4}
 %{instdir}/program/libxmlsec*
+%{instdir}/program/libstlport*.so
+%else
+%{instdir}/program/libxmlsecurity.so
+%{instdir}/program/libstlport*.so
+%endif
 %{instdir}/program/libxmx680*.so
 %{instdir}/program/libxo680*.so
 %{instdir}/program/libxof680*.so
@@ -2056,7 +2288,6 @@
 %{instdir}/program/shlibloader.uno.so
 %{instdir}/program/simplereg.uno.so
 %{instdir}/program/slideshow.uno.so
-%{instdir}/program/sbase
 %{instdir}/program/setofficelang*
 %{instdir}/program/soffice
 %{instdir}/program/soffice.bin
@@ -2171,7 +2402,33 @@
 %dir %{instdir}/share/registry/ldap
 %{instdir}/share/registry/ldap/oo-ad-ldap-attr.map
 %{instdir}/share/registry/ldap/oo-ldap-attr.map
-%{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%{instdir}/share/registry/modules/org/openoffice/Office/Embedding
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/*cjk*
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/*ctl*
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
+
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_base_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_chart_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/GraphicFilter/fcfg_internalgraphics_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_base_others.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_chart_others.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_base_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_chart_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_internalgraphics_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/UISort
 %dir %{instdir}/share/registry/res
 %{instdir}/share/registry/res/en-US
 %dir %{instdir}/share/registry/schema
@@ -2266,7 +2523,6 @@
 %{instdir}/program/liblnth680*.so
 #launchers
 %{_bindir}/openoffice.org-1.9
-%{_bindir}/oobase
 %{_bindir}/ooffice
 %{_bindir}/ooviewdoc
 #gnome integration
@@ -2278,7 +2534,19 @@
 %{_datadir}/icons
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-#.desktops
+#datebase files, create a seperate package ?
+%{instdir}/help/en/sdatabase.*
+%{instdir}/program/sbase
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%{_bindir}/oobase
 %dir %{_datadir}/applications
 %{_datadir}/applications/openoffice.org-1.9-base.desktop
 %dir %{_datadir}/mimelnk
@@ -2332,6 +2600,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-calc.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-calc.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_calc_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_calc_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2368,9 +2649,22 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-draw.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_draw_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_draw_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
-%dir %dir %{instdir}/share/registry/schema/org/openoffice
+%dir %{instdir}/share/registry/schema/org/openoffice
 %dir %{instdir}/share/registry/schema/org/openoffice/Office
 %dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
 %{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
@@ -2397,6 +2691,7 @@
 %{instdir}/program/libhwp.so
 %{instdir}/program/libswd680*.so
 %{instdir}/program/libswui680*.so
+%{instdir}/program/libwpft680*.so
 %{instdir}/program/swriter
 %dir %{instdir}/share
 %dir %{instdir}/share/registry
@@ -2409,6 +2704,30 @@
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_web_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_writer_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_global_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_web_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2454,6 +2773,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-impress.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-impress.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impress_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impress_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2498,6 +2830,19 @@
 %dir %{instdir}/share/registry/data/org/openoffice/Office/UI
 %{instdir}/share/registry/data/org/openoffice/Office/UI/MathCommands.xcu
 %{instdir}/share/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-math.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Setup
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-math.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_math_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_math_types.xcu
 %dir %{instdir}/share/registry/schema
 %dir %{instdir}/share/registry/schema/org
 %dir %{instdir}/share/registry/schema/org/openoffice
@@ -2523,11 +2868,32 @@
 %dir %{instdir}/program
 %{instdir}/program/libflash680*.so
 %{instdir}/program/libsvgfilter680*.so
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_drawgraphics_types.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
+
 
 %files xsltfilter
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/share
+%dir %{instdir}/share/registry
+%dir %{instdir}/share/registry/modules
+%dir %{instdir}/share/registry/modules/org
+%dir %{instdir}/share/registry/modules/org/openoffice
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_xslt_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_xslt_types.xcu
 %dir %{instdir}/share/xslt
 %{instdir}/share/xslt/docbook
 %dir %{instdir}/share/xslt/export
@@ -2561,15 +2927,18 @@
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/hid.lst
+%{instdir}/program/libcommuni680*.so
+%{instdir}/program/libsimplecm680*.so
+%{instdir}/program/testtool.bin
 %dir %{instdir}/program/resource
 %{instdir}/program/resource/stt680en-US.res
-%{instdir}/program/testtool.bin
 
 %files pyuno
 %defattr(-,root,root)
 %dir %{instdir}
 %dir %{instdir}/program
 %{instdir}/program/libpyuno.so
+%{instdir}/program/mailmerge.py*
 %{instdir}/program/pythonloader.py*
 %{instdir}/program/pythonloader.uno.so
 %{instdir}/program/pythonloader.unorc
@@ -2589,6 +2958,77 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jul 13 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.117-1
+- bump to next version and drop the integrated (finally) fpicker patch
+- back to using stlport for now because I'm dubious
+- rh#162984# fallbacks from en_AU to en_GB for wizards
+- rh#160783# set a targetname for font when it's found
+- add openoffice.org-1.9.117.rh163147.thorndale.fontconfig.patch
+- add openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch for
+  rh#161173#
+
+* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-3
+- enable evo addressbook in addressbook wizard
+- rh#162875# extra leading / from file picker
+- update fpicker stuff
+- add workspace.impress63.patch for rh#162158#
+- add openoffice.org-1.9.116.rh162935.gccXXXXX.weirdcrash.patch as a temporary
+  workaround until I figure out just what the hell is wrong
+
+* Mon Jul 11 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-2
+- add openoffice.org-1.9.116.ooo51774.rsc.parallel.patch
+
+* Sat Jul 09 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.116-1
+- bump to new version, Hamburg burning the midnight oil apparently
+- add openoffice.org-1.9.115.ooo51755.scp2.parallel.patch
+- drop integrated openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
+
+* Fri Jul 08 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-3
+- in rawhide we should be able to use system-xmlsec1 now with 
+  system-xmlsec patch
+
+* Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-2
+- add openoffice.org-1.9.115.oooXXXXX.audio.withoutnas.patch
+  and disable worthless nas/portaudio/sndfile stuff
+- add openoffice.org-1.9.115.oooXXXXX.xsltproc.evenwithjava.patch
+  and see if we can build faster with xsltproc
+
+* Thu Jul 07 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.115-1
+- bump to next version
+- add openoffice.org-1.9.115.ooo51673.printing.checkerror.patch
+- rpath of ORIGIN complete, enable failure on regression
+- drop integrated openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
+
+* Mon Jul 04 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.114-2
+- further split langpacks
+- modify test for $ORIGIN rpaths
+- rh#161886# 
+    + openoffice.org-1.9.114.oooXXXXX.rpath.patch
+    + openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+- add openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch for rh#160293#
+- add openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch to workaround
+  multiple pyuno registering failures
+- add openoffice.org-1.9.114.ooo51638.mailmerge.patch to provide email
+  support for maill merge
+- add openoffice.org-1.9.114.oooXXXXX.nostlport.patch and not build
+  stlport
+
+* Mon Jul 04 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.114-1
+- bump to next version
+
+* Thu Jun 30 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.113-1
+- bump to new version
+- translations merged, drop translation sources
+- hsqldb bumped to version with working build.xml, drop sources
+- add patch to work around notorious gcc19870 for hsqldb
+- indic font fallbacks now in upstream
+- openoffice.org-1.9.92.oooXXXXX.addindic.patch integrated
+
+* Wed Jun 29 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.112-2
+- wrong userdir
+- allow fallbacks for translations with partial support file coverage
+- rh#160301# tweak fontconfig patch to ignore opensymbol/starsymbol
+
 * Mon Jun 27 2005 Caolan McNamara <caolanm redhat com> - 1:1.9.112-1
 - bump to next version
 - add openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch for rh#157158#


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- sources	28 Jun 2005 11:28:49 -0000	1.73
+++ sources	14 Jul 2005 08:10:30 -0000	1.74
@@ -1,12 +1,5 @@
-deaaf88b9764421225e01ca82e48061e  GSI_nn.sdf
-905eaeb6aab43af99b9e66cc9b2422b6  GSI_nb.sdf
 a66c6ab52b2eb2deaa7ff85595276b15  GSI_ta-IN.sdf
 176aa81d51a6ed28c5e9a14696a8d208  openoffice.org-jakubicons.tar.gz
-8b62dddd6aacf37798d21a9116230b52  GSI_pa-IN.sdf
-3d59875531c9c84789b0dedf758eb96d  GSI_gu-IN.sdf
-643082a18fe2c8dc4f49cec1069ce6a0  GSI_ru.sdf
 6b3bd4b8eb31dd067d4cb2dcc1ba5e12  openoffice.org-myspell-contrib.tar.gz
-972402c03afa0b20ea2529caab702663  GSI_bn.sdf
 11c0541fa373a327d1c134887ce511e7  openoffice.org-simple-crash_report.sh
-09b8d90ec31b5f35be42a9ad4cdad8b3  SRC680_m112.tar.bz2
-ebe1771041b7cbfd0e4c8f2cece2bd69  hsqldb_1_8_0.zip
+0eb3ae8fa889915f1c302e685de43f98  SRC680_m117.tar.bz2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]