rpms/openoffice.org/devel openoffice.org.langpack-acor.template, 1.1, 1.1.2.1 openoffice.org.langpack-cjk.template, 1.1, 1.1.2.1 openoffice.org.langpack-common.template, 1.1.2.1, 1.1.2.2 openoffice.org.langpack-ctl.template, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.32, 1.1440.2.33

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Mar 26 13:15:25 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22197

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.langpack-acor.template 
	openoffice.org.langpack-cjk.template 
	openoffice.org.langpack-common.template 
	openoffice.org.langpack-ctl.template openoffice.org.spec 
Log Message:
first cut at multi layer OOo


Index: openoffice.org.langpack-acor.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-acor.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org.langpack-acor.template	30 Nov 2007 08:55:47 -0000	1.1
+++ openoffice.org.langpack-acor.template	26 Mar 2008 13:14:38 -0000	1.1.2.1
@@ -1 +1 @@
-%{instdir}/share/autocorr/LINGUPATTERN
+%{basisinstdir}/share/autocorr/LINGUPATTERN


Index: openoffice.org.langpack-cjk.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-cjk.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org.langpack-cjk.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-cjk.template	26 Mar 2008 13:14:38 -0000	1.1.2.1
@@ -1,5 +1,5 @@
-%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-cjk_LANG.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_LANG.xcu


Index: openoffice.org.langpack-common.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-common.template,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- openoffice.org.langpack-common.template	10 Mar 2008 10:43:49 -0000	1.1.2.1
+++ openoffice.org.langpack-common.template	26 Mar 2008 13:14:38 -0000	1.1.2.2
@@ -1,21 +1,21 @@
 %defattr(-,root,root)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/*LANG.res 
-%dir %{instdir}/share
-%dir %{instdir}/share/readme
-%{instdir}/share/readme/LICENSE_LANG
-%{instdir}/share/readme/LICENSE_LANG.html
-%{instdir}/share/readme/README_LANG
-%{instdir}/share/readme/README_LANG.html
-%dir %{instdir}/share/registry 
-%dir %{instdir}/share/registry/res 
-%{instdir}/share/registry/res/LANG
-%dir %{instdir}/share/template 
-%{instdir}/share/template/LANG
-%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-LANG.xcu
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/resource
+%{basisinstdir}/program/resource/*LANG.res 
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/readme
+%{basisinstdir}/share/readme/LICENSE_LANG
+%{basisinstdir}/share/readme/LICENSE_LANG.html
+%{basisinstdir}/share/readme/README_LANG
+%{basisinstdir}/share/readme/README_LANG.html
+%dir %{basisinstdir}/share/registry 
+%dir %{basisinstdir}/share/registry/res 
+%{basisinstdir}/share/registry/res/LANG
+%dir %{basisinstdir}/share/template 
+%{basisinstdir}/share/template/LANG
+%dir %{basisinstdir}/share/registry/modules 
+%dir %{basisinstdir}/share/registry/modules/org 
+%dir %{basisinstdir}/share/registry/modules/org/openoffice 
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Setup 
+%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Langpack-LANG.xcu


Index: openoffice.org.langpack-ctl.template
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.langpack-ctl.template,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org.langpack-ctl.template	19 Feb 2007 16:05:46 -0000	1.1
+++ openoffice.org.langpack-ctl.template	26 Mar 2008 13:14:38 -0000	1.1.2.1
@@ -1,3 +1,3 @@
-%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-ctl_LANG.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_LANG.xcu


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1440.2.32 -r 1.1440.2.33 openoffice.org.spec
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.32
retrieving revision 1.1440.2.33
diff -u -r1.1440.2.32 -r1.1440.2.33
--- openoffice.org.spec	25 Mar 2008 18:24:45 -0000	1.1440.2.32
+++ openoffice.org.spec	26 Mar 2008 13:14:38 -0000	1.1440.2.33
@@ -3,7 +3,7 @@
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
-%define langpacks 1
+%define langpacks 0
 # undef to revert to the traditional print dialog
 %define gtkprintui 1
 # whether to use stlport or gcc's stl, we're basically locked to stlport
@@ -138,7 +138,11 @@
 Patch65: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
 Patch66: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
 
-%define instdir %{_libdir}/openoffice.org
+%define instdir %{_libdir}
+%define baseinstdir %{instdir}/openoffice.org
+%define ureinstdir %{baseinstdir}/ure
+%define basisinstdir %{baseinstdir}/basis3.0
+%define oooinstdir %{instdir}/openoffice.org3.0
 %define OFFICEUPD 300
 %define UPD %nil
 %define SOPOST l*
@@ -1212,18 +1216,18 @@
     echo - ---dump log end---
     dmake openoffice_en-US
 fi
-cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
-cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
-chmod -R +w $RPM_BUILD_ROOT/%{instdir}
+cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{oooinstdir}/program/swriter.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{oooinstdir}/program/scalc.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{oooinstdir}/program/simpress.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{oooinstdir}/program/sdraw.bin
+chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{oooinstdir}
 #provide an owner for these dir
-mkdir -p $RPM_BUILD_ROOT/%{instdir}/extensions
+mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/extensions
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions
 %if %{langpacks}
 dmake ooolanguagepack
 %endif
-export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}/sdk"
+export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{baseinstdir}/sdk"
 export WITH_LANG="en-US"
 dmake sdkoo
 cd ../../
@@ -1233,21 +1237,21 @@
 unzip solver/%{OFFICEUPD}/unxlng*/bin/sun-report-builder.oxt -d $RPM_BUILD_ROOT%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
 
 #add enough to the sdk to build the kde vcl plug out of tree
-cp -r solenv/ $RPM_BUILD_ROOT/%{instdir}/sdk
-cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{instdir}/sdk/linux/bin
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{instdir}/sdk/include
-cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{instdir}/sdk/include
+cp -r solenv/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk
+cp solver/%{OFFICEUPD}/unxlng*/bin/checkdll $RPM_BUILD_ROOT/%{baseinstdir}/sdk/linux/bin
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/comphelper/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/i18npool/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/psprint $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/svtools $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/tools/ $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
+cp -r solver/%{OFFICEUPD}/unxlng*/inc/vos $RPM_BUILD_ROOT/%{baseinstdir}/sdk/include
 
 #configure sdk
-pushd $RPM_BUILD_ROOT/%{instdir}/sdk
+pushd $RPM_BUILD_ROOT/%{baseinstdir}/sdk
     for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
         sed -e "s, at OO_SDK_NAME@,sdk," \
-            -e "s, at OO_SDK_HOME@,%{instdir}/sdk," \
-            -e "s, at OFFICE_HOME@,%{instdir}," \
+            -e "s, at OO_SDK_HOME@,%{baseinstdir}/sdk," \
+            -e "s, at OFFICE_HOME@,%{baseinstdir}," \
             -e "s, at OO_SDK_URE_HOME@,," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
             -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
@@ -1263,12 +1267,12 @@
     mv solenv/unxlng*/bin/dmake solenv/bin
     rm -rf solenv/unx*
 #fix up checkdll
-    sed -i -e "s#^checkdll=.*#checkdll=\"%{instdir}/sdk/linux/bin/checkdll\"#g" solenv/bin/checkdll.sh
+    sed -i -e "s#^checkdll=.*#checkdll=\"%{baseinstdir}/sdk/linux/bin/checkdll\"#g" solenv/bin/checkdll.sh
 #make env
-    echo export PATH=\$PATH:%{instdir}/sdk/solenv/bin > setdevelenv_unix.sh
-    echo export DMAKEROOT=%{instdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
+    echo export PATH=\$PATH:%{baseinstdir}/sdk/solenv/bin > setdevelenv_unix.sh
+    echo export DMAKEROOT=%{baseinstdir}/sdk/solenv/inc/startup >> setdevelenv_unix.sh
     echo export OS="LINUX" >> setdevelenv_unix.sh
-    echo export SOLARENV=%{instdir}/sdk/solenv >> setdevelenv_unix.sh
+    echo export SOLARENV=%{baseinstdir}/sdk/solenv >> setdevelenv_unix.sh
     echo export SOLARVER="\`pwd\`/solver/%{OFFICEUPD}" >> setdevelenv_unix.sh
     echo export SOLARVERSION="\$SOLARVER" >> setdevelenv_unix.sh
     echo export INPATH="$INPATH" >> setdevelenv_unix.sh
@@ -1288,8 +1292,8 @@
     echo export CPU="$CPU" >> setdevelenv_unix.sh
     echo export MAKEDEPEND=makedepend >> setdevelenv_unix.sh
     echo export MKOUT="mkout.pl" >> setdevelenv_unix.sh
-    echo export SOLARINC=\"-I%{instdir}/sdk/include/stl -I%{instdir}/sdk/include\" >> setdevelenv_unix.sh
-    echo export SOLARLIB=\"-L%{instdir}/program\" >> setdevelenv_unix.sh
+    echo export SOLARINC=\"-I%{baseinstdir}/sdk/include/stl -I%{baseinstdir}/sdk/include\" >> setdevelenv_unix.sh
+    echo export SOLARLIB=\"-L%{baseinstdir}/program\" >> setdevelenv_unix.sh
     echo export GXX_INCLUDE_PATH="$GXX_INCLUDE_PATH" >> setdevelenv_unix.sh
     echo export EXTERNAL_WARNINGS_NOT_ERRORS="TRUE" >> setdevelenv_unix.sh
     echo export GVER="VCL" >> setdevelenv_unix.sh
@@ -1302,25 +1306,23 @@
 
 #add our custom configuration options
 #default GTK fpicker
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
+#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH2}
 #don't prompt user to agree to license
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
+#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH3}
 #default autosave settings
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH4}
+#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH4}
 #libtextcat fingerprint location
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH5}
-#rhbz#151356 set a consistent bootstrap value, unfortunately upstream finally picked a different one
-sed -i -e s/org2/org2.0/ $RPM_BUILD_ROOT/%{instdir}/program/bootstraprc
+#$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH5}
 #give a consistent javasettingsunopkginstall.xml
-$RPM_BUILD_ROOT/%{instdir}/program/unopkg list --shared || :
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/uno_packages/cache/* || :
+#$RPM_BUILD_ROOT/%{oooinstdir}/program/unopkg list --shared || :
+rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache/* || :
 
 #add the debugging libsalalloc_malloc.so.3 library
-cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
+cp -f solver/%{OFFICEUPD}/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{ureinstdir}/lib
 
 #We don't need to carry around all the letter templates for all the languages 
 #in each langpack! In addition, all the bitmaps are the same!
-pushd $RPM_BUILD_ROOT/%{instdir}/share/template
+pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/template
 mkdir -p wizard
 for I in %{langpack_langs}; do
 	cp -afl $I/wizard/bitmap wizard/
@@ -1338,7 +1340,7 @@
 popd
 
 #Set some aliases to canonical autocorrect language files for locales with matching languages
-pushd $RPM_BUILD_ROOT/%{instdir}/share/autocorr
+pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
 en_GB_aliases="en-AU en-BS en-BZ en-CA en-GH en-IE en-IN en-JM en-NA en-NZ en-TT en-ZA en-ZW"
 for lang in $en_GB_aliases; do
         ln -sf acor_en-GB.dat acor_$lang.dat
@@ -1440,59 +1442,51 @@
 done
 
 #add in some templates
-tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{instdir}/share
+tar xzf %{SOURCE2} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
+tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
+tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
 
 #enable gtk file dialog as the default
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
 
 #remove dictooo stuff which we disabled in configure
-rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
-
-#remove script to munge OOo2 mime info into system, we'll do that
-rm -f $RPM_BUILD_ROOT/%{instdir}/program/update-mime-data
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 
 #remove evolution 1 address book driver
-rm -f $RPM_BUILD_ROOT/%{instdir}/program/libevoab1.so
+rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
 
 #remove pagein stuff
-rm -f $RPM_BUILD_ROOT/%{instdir}/program/pagein*
+rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/pagein*
 
 #remove dummy .dat files
-rm -f $RPM_BUILD_ROOT/%{instdir}/program/root?.dat
+rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/root?.dat
 
 #remove ancient icons in favour of tango
-pushd $RPM_BUILD_ROOT/%{instdir}/share/config/
+pushd $RPM_BUILD_ROOT/%{oooinstdir}/share/config/
+rm -f images_industrial.zip
 ln -sf images_tango.zip images.zip
 popd
[...2035 lines suppressed...]
-%{instdir}/share/xslt/docbook
-%dir %{instdir}/share/xslt/export
-%{instdir}/share/xslt/export/xhtml
-%{instdir}/share/xslt/wiki/
+%dir %{basisinstdir}
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_xslt_filters.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_xslt_types.xcu
+%dir %{basisinstdir}/share/xslt
+%{basisinstdir}/share/xslt/docbook
+%dir %{basisinstdir}/share/xslt/export
+%{basisinstdir}/share/xslt/export/xhtml
+%{basisinstdir}/share/xslt/wiki/
 
 %files javafilter
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%dir %{instdir}/program/classes
-%{instdir}/program/classes/aportisdoc.jar
-%{instdir}/program/classes/pexcel.jar
-%{instdir}/program/classes/pocketword.jar
-%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_palm_filters.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
-%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%dir %{basisinstdir}/program/classes
+%{basisinstdir}/program/classes/aportisdoc.jar
+%{basisinstdir}/program/classes/pexcel.jar
+%{basisinstdir}/program/classes/pocketword.jar
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
 
 %files testtools
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/hid.lst
-%{instdir}/program/libcommuni%{SOPOST}.so
-%{instdir}/program/libsalalloc_malloc.so.3
-%{instdir}/program/libsimplecm%{SOPOST}.so
-%{instdir}/program/testtoolrc
-%{instdir}/program/testtool.bin
-%dir %{instdir}/program/resource
-%{instdir}/program/resource/stt%{UPD}en-US.res
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/hid.lst
+%{basisinstdir}/program/libcommuni%{SOPOST}.so
+%{ureinstdir}/lib/libsalalloc_malloc.so.3
+%{basisinstdir}/program/libsimplecm%{SOPOST}.so
+%{basisinstdir}/program/testtoolrc
+%{basisinstdir}/program/testtool.bin
+%dir %{basisinstdir}/program/resource
+%{basisinstdir}/program/resource/stt%{UPD}en-US.res
 
 %files sdk
 %defattr(-,root,root,-)
-%{instdir}/sdk/
-%exclude %{instdir}/sdk/setdevelenv_unix.sh
-%exclude %{instdir}/sdk/docs/
-%exclude %{instdir}/sdk/examples/
-%exclude %{instdir}/sdk/include/tools
-%exclude %{instdir}/sdk/include/comphelper
-%exclude %{instdir}/sdk/include/i18npool
-%exclude %{instdir}/sdk/include/vos
-%exclude %{instdir}/sdk/include/psprint
-%exclude %{instdir}/sdk/solenv
-%exclude %{instdir}/sdk/linux/bin/checkdll
+%{baseinstdir}/sdk/
+%exclude %{baseinstdir}/sdk/setdevelenv_unix.sh
+%exclude %{baseinstdir}/sdk/docs/
+%exclude %{baseinstdir}/sdk/examples/
+%exclude %{baseinstdir}/sdk/include/tools
+%exclude %{baseinstdir}/sdk/include/comphelper
+%exclude %{baseinstdir}/sdk/include/i18npool
+%exclude %{baseinstdir}/sdk/include/vos
+%exclude %{baseinstdir}/sdk/include/psprint
+%exclude %{baseinstdir}/sdk/solenv
+%exclude %{baseinstdir}/sdk/linux/bin/checkdll
 
 %files sdk-doc
 %defattr(-,root,root,-)
-%{instdir}/sdk/docs/
-%{instdir}/sdk/examples/
+%{baseinstdir}/sdk/docs/
+%{baseinstdir}/sdk/examples/
 
 %files devel
 %defattr(-,root,root,-)
-%{instdir}/sdk/setdevelenv_unix.sh
-%{instdir}/sdk/include/tools
-%{instdir}/sdk/include/comphelper
-%{instdir}/sdk/include/i18npool
-%{instdir}/sdk/include/vos
-%{instdir}/sdk/include/psprint
-%{instdir}/sdk/solenv
-%{instdir}/sdk/linux/bin/checkdll
+%{baseinstdir}/sdk/setdevelenv_unix.sh
+%{baseinstdir}/sdk/include/tools
+%{baseinstdir}/sdk/include/comphelper
+%{baseinstdir}/sdk/include/i18npool
+%{baseinstdir}/sdk/include/vos
+%{baseinstdir}/sdk/include/psprint
+%{baseinstdir}/sdk/solenv
+%{baseinstdir}/sdk/linux/bin/checkdll
 
 %files headless
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/libbasebmp%{SOPOST}.so
-%{instdir}/program/libvclplug_svp%{SOPOST}.so
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/libbasebmp%{SOPOST}.so
+%{basisinstdir}/program/libvclplug_svp%{SOPOST}.so
 
 %files pyuno
 %defattr(-,root,root,-)
-%dir %{instdir}
-%dir %{instdir}/program
-%{instdir}/program/libpyuno.so
-%{instdir}/program/officehelper.py*
-%{instdir}/program/pythonloader.py*
-%{instdir}/program/pythonloader.uno.so
-%{instdir}/program/pythonloader.unorc
-%{instdir}/program/pythonscript.py*
-%{instdir}/program/pyuno.so
-%dir %{instdir}/share
-%dir %{instdir}/share/Scripts
-%{instdir}/share/Scripts/python
-%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/Scripting
-%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
+%dir %{basisinstdir}
+%dir %{basisinstdir}/program
+%{basisinstdir}/program/libpyuno.so
+%{basisinstdir}/program/officehelper.py*
+%{basisinstdir}/program/pythonloader.py*
+%{basisinstdir}/program/pythonloader.uno.so
+%{basisinstdir}/program/pythonloader.unorc
+%{basisinstdir}/program/pythonscript.py*
+%{basisinstdir}/program/pyuno.so
+%dir %{basisinstdir}/share
+%dir %{basisinstdir}/share/Scripts
+%{basisinstdir}/share/Scripts/python
+%dir %{basisinstdir}/share/registry
+%dir %{basisinstdir}/share/registry/modules
+%dir %{basisinstdir}/share/registry/modules/org
+%dir %{basisinstdir}/share/registry/modules/org/openoffice
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
+%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 %{python_py_sitearch}/uno.py*
 %{python_py_sitearch}/unohelper.py*
 
@@ -2950,7 +2929,6 @@
 - drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
 - Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
 
->>>>>>> 1.1452
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-9.1
 - next release candidate
 




More information about the fedora-extras-commits mailing list