rpms/openoffice.org/devel openoffice.org.spec,1.1471,1.1472
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Apr 9 08:07:29 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537
Modified Files:
openoffice.org.spec
Log Message:
add big complicated BrOffice.org support infrastructure
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1471
retrieving revision 1.1472
diff -u -r1.1471 -r1.1472
--- openoffice.org.spec 8 Apr 2008 08:55:03 -0000 1.1471
+++ openoffice.org.spec 9 Apr 2008 08:06:38 -0000 1.1472
@@ -140,13 +140,13 @@
Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
Patch68: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
Patch69: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
-Patch70: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
%define ureinstdir %{baseinstdir}/ure
%define basisinstdir %{baseinstdir}/basis3.0
%define oooinstdir %{instdir}/openoffice.org3.0
+%define brinstdir %{instdir}/broffice.org3.0
%define OFFICEUPD 300
%define UPD %nil
%define SOPOST l*
@@ -187,6 +187,23 @@
%description core
The shared core libraries and support files for %{name}.
+%package brand
+Summary: Core brand for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description brand
+The shared core branding files for %{name}.
+
+%package -n broffice.org-brand
+Summary: Core brand for BrOffice.org
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-langpack-pt_PT = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-brand
+The shared core branding files for BrOffice.org
+
%package pyuno
Summary: Python bindings for %{name}
Group: Development/Libraries
@@ -199,88 +216,195 @@
external to %{name} and within the internal %{name} scripting module to be
written in python.
+%package base-core
+Summary: Database GUI libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description base-core
+GUI database libraries for %{name}.
+
%package base
Summary: Database frontend for %{name}
Group: Applications/Productivity
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
Obsoletes: openoffice.org2-base
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
%description base
GUI database frontend for %{name}. Allows creation and management of
databases through a GUI.
+%package -n broffice.org-base
+Summary: Database frontend for BrOffice.org
+Group: Applications/Productivity
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-base
+GUI database frontend for BrOffice.org. Allows creation and management of
+databases through a GUI.
+
%package report-builder
Summary: Create database reports from %{name}
Group: Applications/Productivity
-Requires: %{name}-base = %{epoch}:%{version}-%{release}
+Requires: %{name}-base-core = %{epoch}:%{version}-%{release}
%description report-builder
Creates database reports from %{name}-base. The report builder can define group
and page headers as well as group, page footers and calculation fields to
accomplish complex database reports.
+%package writer-core
+Summary: Word Processor libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: libwpd >= 0.8.0, openoffice.org-writer2latex
+
+%description writer-core
+The wordprocessor libraries of %{name}.
+
%package writer
Summary: Word Processor module for %{name}
Group: Applications/Productivity
Obsoletes: openoffice.org
Obsoletes: openoffice.org2-writer
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: libwpd >= 0.8.0, openoffice.org-writer2latex
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
%description writer
The wordprocessor application of %{name}.
+%package -n broffice.org-writer
+Summary: Word Processor module for BrOffice.org
+Group: Applications/Productivity
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-writer
+The wordprocessor application of BrOffice.org
+
%package emailmerge
Summary: Email mail merge component for %{name}
Group: Applications/Productivity
Obsoletes: openoffice.org2-emailmerge
-Requires: %{name}-writer = %{epoch}:%{version}-%{release}
+Requires: %{name}-writer-core = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
%description emailmerge
Enables the %{name} writer module to mail merge to email.
+%package calc-core
+Summary: Spreadsheet libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description calc-core
+The spreadsheet libraries of %{name}.
+
%package calc
Summary: Spreadsheet module for %{name}
-Obsoletes: openoffice.org
-Obsoletes: openoffice.org2-calc
Group: Applications/Productivity
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-calc-core = %{epoch}:%{version}-%{release}
%description calc
The spreadsheet application of %{name}.
+%package -n broffice.org-calc
+Summary: Spreadsheet module for BrOffice.org
+Group: Applications/Productivity
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-calc-core = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-calc
+The spreadsheet application of BrOffice.org
+
+%package draw-core
+Summary: Drawing libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
+
+%description draw-core
+The drawing libraries of %{name}.
+
%package draw
Summary: Drawing module for %{name}
Group: Applications/Productivity
Obsoletes: openoffice.org
Obsoletes: openoffice.org2-draw
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
+Requires: %{name}-draw-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
%description draw
The drawing application of %{name}.
+%package -n broffice.org-draw
+Summary: Drawing module for BrOffice.org
+Group: Applications/Productivity
+Requires: %{name}-draw-core = %{epoch}:%{version}-%{release}
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-draw
+The drawing application of BrOffice.org
+
+%package impress-core
+Summary: Presentation libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description impress-core
+The presentation libraries of %{name}.
+
%package impress
Summary: Presentation module for %{name}
Group: Applications/Productivity
Obsoletes: openoffice.org
Obsoletes: openoffice.org2-impress
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
%description impress
The presentation application of %{name}.
+%package -n broffice.org-impress
+Summary: Presentation module for BrOffice.org
+Group: Applications/Productivity
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-impress-core = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-impress
+The presentation application of BrOffice.org
+
+%package math-core
+Summary: Equation editor libraries for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description math-core
+The math editor libraries of %{name}.
+
%package math
Summary: Equation editor module for %{name}
Group: Applications/Productivity
Obsoletes: openoffice.org
Obsoletes: openoffice.org2-math
-Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-math-core = %{epoch}:%{version}-%{release}
%description math
The math editor of %{name}.
+%package -n broffice.org-math
+Summary: Equation editor module for BrOffice.org
+Group: Applications/Productivity
+Requires: broffice.org-brand = %{epoch}:%{version}-%{release}
+Requires: %{name}-math-core = %{epoch}:%{version}-%{release}
+
+%description -n broffice.org-math
+The math editor of BrOffice.org.
+
%package graphicfilter
Summary: Extra graphic filters for %{name}
Group: Applications/Productivity
@@ -1125,7 +1249,6 @@
%patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
%patch68 -p1 -b .ooo85691.vcl.tooltipcolor.patch
%patch69 -p1 -b .ooo87991.fpickersafe.patch
-%patch70 -p1 -b .ooo88033.svx.a11ycrash.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1134,7 +1257,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} --with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --with-vba-package-format="builtin" --enable-dbus --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-hunspell --with-system-altlinuxhyph --with-system-libtextcat --with-system-vigra --without-myspell-dicts --without-system-mspack --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms --without-writer2latex %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -1204,12 +1327,16 @@
fi
#generate the icons and mime type stuff
-cd ../../sysui/unxlng*/misc/openoffice.org
export DESTDIR=../../../output
export KDEMAINDIR=/usr
export GNOMEDIR=/usr
export GNOME_MIME_THEME=hicolor
+cd ../../sysui/unxlng*/misc/openoffice.org
+./create_tree.sh
+%if %{langpacks}
+cd ../../sysui/unxlng*/misc/broffice.org
./create_tree.sh
+%endif
#start of jakub based suggestion on prelink optimization
cd ../../../../desktop/util
@@ -1232,22 +1359,46 @@
cd instsetoo_native/util
#get an unpackaged raw install
export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
+%if %{langpacks}
+if ! dmake broffice_pt-BR; then
+ echo - ---dump log start---
+ cat ../unx*.pro/BrOffice/rpm/logging/pt-BR/log_*_pt-BR.log
+ echo - ---dump log end---
+ dmake broffice_pt-BR
+fi
+rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/ure
+rm -rf $RPM_BUILD_ROOT/%{baseinstdir}/basis3.0
+%endif
if ! dmake openoffice_en-US; then
echo - ---dump log start---
cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
echo - ---dump log end---
dmake openoffice_en-US
fi
-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/%{baseinstdir}/extensions
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions
%if %{langpacks}
dmake ooolanguagepack
+chmod -R +w $RPM_BUILD_ROOT/%{brinstdir}
+%endif
+for file in swriter scalc simpress sdraw ; do
+ cp -f ../../desktop/$OUTPATH.pro/bin/$file $RPM_BUILD_ROOT/%{oooinstdir}/program/$file.bin
+%if %{langpacks}
+ cp -f ../../desktop/$OUTPATH.pro/bin/$file $RPM_BUILD_ROOT/%{brinstdir}/program/$file.bin
+%endif
+done
+#share cache between brands, and reuse OOo2 cache
+mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/share/uno_packages/cache
+#give a consistent javasettingsunopkginstall.xml
+$RPM_BUILD_ROOT/%{oooinstdir}/program/unopkg list --shared || :
+rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache || :
+ln -s $RPM_BUILD_ROOT/%{oooinstdir}/share/uno_packages/cache ../../../../%{baseinstdir}/share/uno_packages/cache
+%if %{langpacks}
+$RPM_BUILD_ROOT/%{brinstdir}/program/unopkg list --shared || :
+rm -rf $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages/cache || :
+ln -s $RPM_BUILD_ROOT/%{brinstdir}/share/uno_packages/cache ../../../../%{baseinstdir}/share/uno_packages/cache
%endif
export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{baseinstdir}/sdk"
export WITH_LANG="en-US"
@@ -1343,9 +1494,6 @@
#libtextcat fingerprint location
mkdir -p $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
cp %{PATCH5} $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
-#give a consistent javasettingsunopkginstall.xml
-#$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/%{ureinstdir}/lib
@@ -1490,9 +1638,18 @@
rm -f images_industrial.zip
ln -sf images_tango.zip images.zip
popd
+%if %{langpacks}
+pushd $RPM_BUILD_ROOT/%{brinstdir}/share/config/
+rm -f images_industrial.zip
+ln -sf images_tango.zip images.zip
+popd
+%endif
#set standard permissions for rpmlint
find $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{basisinstdir} $RPM_BUILD_ROOT/%{oooinstdir} -exec chmod +w {} \;
+%if %{langpacks}
+find $RPM_BUILD_ROOT/%{brinstdir} -exec chmod +w {} \;
+%endif
# move python bits into site-packages
mkdir -p $RPM_BUILD_ROOT/%{python_py_sitearch}
@@ -1529,6 +1686,9 @@
#add in a simple crash reporter replacement
cp -f %{PATCH0} $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
chmod a+x $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report
+%if %{langpacks}
+cp $RPM_BUILD_ROOT/%{oooinstdir}/program/crash_report $RPM_BUILD_ROOT/%{brinstdir}/program/crash_report
+%endif
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -1638,6 +1798,44 @@
cp -p ../../../unxlng*.pro/misc/openoffice.org/openoffice.org.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages
popd
+%if %{langpacks}
+pushd $RPM_BUILD_ROOT/%{brinstdir}/share/xdg/
+chmod u+w *.desktop
+for file in *.desktop; do
+ # rhbz#156067 don't version the icons
+ sed -i -e "s/$ICONPRODUCTVERSION//g" $file
+ # rhbz#156677 remove the version from Name=
+ sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+done
+echo "StartupNotify=true" >> base.desktop
+echo "TryExec=oobase" >> base.desktop
+echo "StartupNotify=true" >> calc.desktop
+echo "TryExec=oocalc" >> calc.desktop
+echo "StartupNotify=true" >> impress.desktop
+echo "TryExec=ooimpress" >> impress.desktop
+echo "StartupNotify=true" >> writer.desktop
+echo "TryExec=oowriter" >> writer.desktop
+echo "StartupNotify=true" >> math.desktop
+echo "TryExec=oomath" >> math.desktop
+echo "StartupNotify=true" >> draw.desktop
+echo "TryExec=oodraw" >> draw.desktop
+# rh#156677# / rh#186515#
+echo "NoDisplay=true" >> math.desktop
+chmod u-w *.desktop
+# relocate the .desktop and icon files
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
+cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-base.desktop
+cp -p calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-calc.desktop
+cp -p impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-impress.desktop
+cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-writer.desktop
+cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-math.desktop
+cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-draw.desktop
+cp -p extensionmgr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/broffice.org-extensionmgr.desktop
+popd
+%endif
+
+rm -rf $RPM_BUILD_ROOT/%{brinstdir}/readmes
+rm -rf $RPM_BUILD_ROOT/%{brinstdir}/licenses
rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/readmes
rm -rf $RPM_BUILD_ROOT/%{oooinstdir}/licenses
@@ -1718,13 +1916,11 @@
%files core
%defattr(-,root,root,-)
%dir %{_datadir}/openoffice.org/extensions
-%dir %{oooinstdir}
+%dir %{baseinstdir}
+%dir %{baseinstdir}/share
+%dir %{baseinstdir}/share/uno_packages
+%{baseinstdir}/share/uno_packages/cache
%dir %{baseinstdir}/extensions
-%{oooinstdir}/LICENSE
-%{oooinstdir}/LICENSE.html
-%{oooinstdir}/README
-%{oooinstdir}/README.html
-%{oooinstdir}/THIRDPARTYLICENSEREADME.html
%dir %{basisinstdir}/help
%dir %{basisinstdir}/help/en
%{basisinstdir}/help/en/default.css
@@ -1739,10 +1935,8 @@
%{basisinstdir}/help/main_transform.xsl
%{basisinstdir}/presets
%dir %{basisinstdir}/program
-%{oooinstdir}/program/about.bmp
%{basisinstdir}/program/addin
%{basisinstdir}/program/basprov%{SOPOST}.uno.so
-%{oooinstdir}/program/bootstraprc
%{basisinstdir}/program/canvasfactory.uno.so
%{basisinstdir}/program/cde-open-url
%dir %{basisinstdir}/program/classes
@@ -1776,7 +1970,6 @@
%{basisinstdir}/program/configimport
%{basisinstdir}/program/configimport.bin
%{basisinstdir}/program/configmgrrc
-%{oooinstdir}/program/crash_report
%{basisinstdir}/program/deployment%{SOPOST}.uno.so
%{basisinstdir}/program/deploymentgui%{SOPOST}.uno.so
%{basisinstdir}/program/dlgprov%{SOPOST}.uno.so
@@ -1790,7 +1983,6 @@
%{basisinstdir}/program/gnome-open-url.bin
%{basisinstdir}/program/hatchwindowfactory.uno.so
%{basisinstdir}/program/i18nsearch.uno.so
-%{oooinstdir}/program/intro.bmp
%{basisinstdir}/program/kde-open-url
%{basisinstdir}/program/legacy_binfilters.rdb
%{basisinstdir}/program/libabp%{SOPOST}.so
@@ -1976,7 +2168,6 @@
%{basisinstdir}/program/resource/gal%{UPD}en-US.res
%{basisinstdir}/program/resource/imp%{UPD}en-US.res
%{basisinstdir}/program/resource/ofa%{UPD}en-US.res
-%{oooinstdir}/program/resource/ooo%{UPD}en-US.res
%{basisinstdir}/program/resource/pcr%{UPD}en-US.res
%{basisinstdir}/program/resource/pdffilter%{UPD}en-US.res
%{basisinstdir}/program/resource/preload%{UPD}en-US.res
@@ -2009,26 +2200,19 @@
%{basisinstdir}/program/simplecanvas.uno.so
%{basisinstdir}/program/slideshow.uno.so
%{basisinstdir}/program/setofficelang*
-%{oooinstdir}/program/soffice
-%{oooinstdir}/program/soffice.bin
%{basisinstdir}/program/libsoffice.so
-%{oooinstdir}/program/sofficerc
-%{oooinstdir}/program/spadmin
%{basisinstdir}/program/spadmin.bin
%{basisinstdir}/program/stringresource%{SOPOST}.uno.so
%{basisinstdir}/program/svtmisc.uno.so
%{basisinstdir}/program/syssh.uno.so
%{basisinstdir}/program/ucpexpand1.uno.so
%{basisinstdir}/program/ucptdoc1.uno.so
-%{oooinstdir}/program/unopkg
-%{oooinstdir}/program/unopkg.bin
%{basisinstdir}/program/unorc
%{basisinstdir}/program/updatefeed.uno.so
%{basisinstdir}/ure-link
%{basisinstdir}/program/uri-encode
%{basisinstdir}/program/vclcanvas.uno.so
%{basisinstdir}/program/cairocanvas.uno.so
-%{oooinstdir}/program/versionrc
%dir %{basisinstdir}/share
%{basisinstdir}/share/Scripts
%dir %{basisinstdir}/share/autocorr
@@ -2040,10 +2224,6 @@
%{basisinstdir}/share/autotext
%{basisinstdir}/share/basic
%dir %{basisinstdir}/share/config
-%{oooinstdir}/share/config/images.zip
-%{oooinstdir}/share/config/images_crystal.zip
-%{oooinstdir}/share/config/images_hicontrast.zip
-%{oooinstdir}/share/config/images_tango.zip
%{basisinstdir}/share/config/javasettingsunopkginstall.xml
%{basisinstdir}/share/config/psetup.xpm
%{basisinstdir}/share/config/psetupl.xpm
@@ -2060,11 +2240,6 @@
%{basisinstdir}/share/fonts
%{basisinstdir}/share/gallery
%{basisinstdir}/share/psprint
-%dir %{oooinstdir}/share/readme
-%{oooinstdir}/share/readme/LICENSE_en-US
-%{oooinstdir}/share/readme/LICENSE_en-US.html
-%{oooinstdir}/share/readme/README_en-US
-%{oooinstdir}/share/readme/README_en-US.html
%dir %{basisinstdir}/share/registry
%dir %{basisinstdir}/share/registry/data
%dir %{basisinstdir}/share/registry/data/org
@@ -2075,8 +2250,6 @@
%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
%{basisinstdir}/share/registry/data/org/openoffice/Office/Calc.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/Canvas.xcu
-%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
-%{oooinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/DataAccess.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/Embedding.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -2094,7 +2267,6 @@
%{basisinstdir}/share/registry/data/org/openoffice/Office/Security.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/TableWizard.xcu
%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{oooinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -2118,7 +2290,6 @@
%{basisinstdir}/share/registry/data/org/openoffice/Office/Views.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/WebWizard.xcu
%{basisinstdir}/share/registry/data/org/openoffice/Office/Writer.xcu
-%{oooinstdir}/share/registry/data/org/openoffice/Setup.xcu
%{basisinstdir}/share/registry/data/org/openoffice/TypeDetection
%{basisinstdir}/share/registry/data/org/openoffice/UserProfile.xcu
%{basisinstdir}/share/registry/data/org/openoffice/VCL.xcu
@@ -2247,9 +2418,7 @@
%dir %{basisinstdir}/share/template
%{basisinstdir}/share/template/en-US
%{basisinstdir}/share/template/wizard
-%{oooinstdir}/share/uno_packages
%{basisinstdir}/share/wordbook
-%{oooinstdir}/share/xdg/
%dir %{basisinstdir}/share/xslt
%{basisinstdir}/share/xslt/common
%dir %{basisinstdir}/share/xslt/export
@@ -2276,7 +2445,6 @@
%{_datadir}/mime-info/*
%{basisinstdir}/program/libxmlsecurity.so
%{basisinstdir}/program/liboldxmlsec*
-%{_datadir}/applications/openoffice.org-extensionmgr.desktop
%{_datadir}/mime/packages/openoffice.org.xml
%{_datadir}/mimelnk/application/*extension*
%{basisinstdir}/program/behelper.uno.so
@@ -2321,19 +2489,8 @@
%{basisinstdir}/program/stocservices.uno.so
#vba
%{basisinstdir}/program/oovbaapi.rdb
-#new stuff
-%{oooinstdir}/program/fundamentalrc
-%{oooinstdir}/program/redirectrc
-%{oooinstdir}/basis-link
%post core
-if [ $1 -gt 1 ]; then
- # Upgrading => migrate OpenOffice.org2 extensions
- if [ -e %{baseinstdir}/share/uno_packages/cache/uno_packages.db ]; then
- mv %{baseinstdir}/share/uno_packages/cache/* %{oooinstdir}/share/uno_packages/cache/ || :
- fi
-fi
-update-desktop-database -q %{_datadir}/applications
update-mime-database %{_datadir}/mime > /dev/null
for theme in hicolor locolor; do
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -2347,7 +2504,6 @@
done
%postun core
-update-desktop-database -q %{_datadir}/applications
update-mime-database %{_datadir}/mime > /dev/null
for theme in hicolor locolor; do
if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -2363,13 +2519,120 @@
%preun core
if [ $1 -eq 0 ]; then
# not upgrading => remove component cache
- rm -rf %{oooinstdir}/share/uno_packages/cache/* || :
+ rm -rf %{baseinstdir}/share/uno_packages/cache/* || :
fi
-%files base
+%files brand
+%dir %{oooinstdir}
+%{oooinstdir}/LICENSE
+%{oooinstdir}/LICENSE.html
+%{oooinstdir}/README
+%{oooinstdir}/README.html
+%{oooinstdir}/THIRDPARTYLICENSEREADME.html
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/about.bmp
+%{oooinstdir}/program/bootstraprc
+%{oooinstdir}/program/crash_report
+%{oooinstdir}/program/intro.bmp
+%dir %{oooinstdir}/program/resource
+%{oooinstdir}/program/resource/ooo%{UPD}en-US.res
+%{oooinstdir}/program/soffice
+%{oooinstdir}/program/soffice.bin
+%{oooinstdir}/program/sofficerc
+%{oooinstdir}/program/spadmin
+%{oooinstdir}/program/unopkg
+%{oooinstdir}/program/unopkg.bin
+%{oooinstdir}/program/versionrc
+%dir %{oooinstdir}/share
+%dir %{oooinstdir}/share/config
+%{oooinstdir}/share/config/images.zip
+%{oooinstdir}/share/config/images_crystal.zip
+%{oooinstdir}/share/config/images_hicontrast.zip
+%{oooinstdir}/share/config/images_tango.zip
+%dir %{oooinstdir}/share/readme
+%{oooinstdir}/share/readme/LICENSE_en-US
+%{oooinstdir}/share/readme/LICENSE_en-US.html
+%{oooinstdir}/share/readme/README_en-US
+%{oooinstdir}/share/readme/README_en-US.html
+%dir %{oooinstdir}/share/registry
+%dir %{oooinstdir}/share/registry/data
+%dir %{oooinstdir}/share/registry/data/org
+%dir %{oooinstdir}/share/registry/data/org/openoffice
+%dir %{oooinstdir}/share/registry/data/org/openoffice/Office
+%{oooinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+%{oooinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
+%{oooinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
+%{oooinstdir}/share/registry/data/org/openoffice/Setup.xcu
+%{oooinstdir}/share/uno_packages
+%{oooinstdir}/share/xdg/
+%{oooinstdir}/program/fundamentalrc
+%{oooinstdir}/program/redirectrc
+%{oooinstdir}/basis-link
+%{_datadir}/applications/openoffice.org-extensionmgr.desktop
+
+%post brand
+update-desktop-database -q %{_datadir}/applications
+
+%postun brand
+update-desktop-database -q %{_datadir}/applications
+
+%files -n broffice.org-brand
+%dir %{brinstdir}
+%{brinstdir}/LICENSE
+%{brinstdir}/LICENSE.html
+%{brinstdir}/README
+%{brinstdir}/README.html
+%{brinstdir}/THIRDPARTYLICENSEREADME.html
+%dir %{brinstdir}/program
+%{brinstdir}/program/about.bmp
+%{brinstdir}/program/bootstraprc
+%{brinstdir}/program/crash_report
+%{brinstdir}/program/intro.bmp
+%dir %{brinstdir}/program/resource
+%{brinstdir}/program/resource/ooo%{UPD}pt-BR.res
+%{brinstdir}/program/soffice
+%{brinstdir}/program/soffice.bin
+%{brinstdir}/program/sofficerc
+%{brinstdir}/program/spadmin
+%{brinstdir}/program/unopkg
+%{brinstdir}/program/unopkg.bin
+%{brinstdir}/program/versionrc
+%dir %{brinstdir}/share
+%dir %{brinstdir}/share/config
+%{brinstdir}/share/config/images.zip
+%{brinstdir}/share/config/images_crystal.zip
+%{brinstdir}/share/config/images_hicontrast.zip
+%{brinstdir}/share/config/images_tango.zip
+%dir %{brinstdir}/share/readme
+%{brinstdir}/share/readme/LICENSE_pt-BR
+%{brinstdir}/share/readme/LICENSE_pt-BR.html
+%{brinstdir}/share/readme/README_pt-BR
+%{brinstdir}/share/readme/README_pt-BR.html
+%dir %{brinstdir}/share/registry
+%dir %{brinstdir}/share/registry/data
+%dir %{brinstdir}/share/registry/data/org
+%dir %{brinstdir}/share/registry/data/org/openoffice
+%dir %{brinstdir}/share/registry/data/org/openoffice/Office
+%{brinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+%{brinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
+%{brinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
+%{brinstdir}/share/registry/data/org/openoffice/Setup.xcu
+%{brinstdir}/share/uno_packages
+%{brinstdir}/share/xdg/
+%{brinstdir}/program/fundamentalrc
+%{brinstdir}/program/redirectrc
+%{brinstdir}/basis-link
+%{_datadir}/applications/broffice.org-extensionmgr.desktop
+
+%post -n broffice.org-brand
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-brand
+update-desktop-database -q %{_datadir}/applications
+
+%files base-core
%defattr(-,root,root,-)
%{basisinstdir}/help/en/sdatabase.*
-%{oooinstdir}/program/sbase
%{basisinstdir}/program/libadabasui%{SOPOST}.so
%{basisinstdir}/program/librpt*%{SOPOST}.so
%dir %{basisinstdir}/program/resource
@@ -2407,15 +2670,34 @@
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
%{_bindir}/oobase
-%{_datadir}/applications/openoffice.org-*-base.desktop
%{_datadir}/mimelnk/application/*database*
+%files base
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/sbase
+%{_datadir}/applications/openoffice.org-*-base.desktop
+
%post base
update-desktop-database -q %{_datadir}/applications
%postun base
update-desktop-database -q %{_datadir}/applications
+%files -n broffice.org-base
+%defattr(-,root,root,-)
+%dir %{brinstdir}
+%dir %{brinstdir}/program
+%{brinstdir}/program/sbase
+%{_datadir}/applications/broffice.org-base.desktop
+
+%post -n broffice.org-base
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-base
+update-desktop-database -q %{_datadir}/applications
+
%files report-builder
%defattr(-,root,root,-)
%{_datadir}/openoffice.org/extensions/sun-report-builder.oxt
@@ -2440,7 +2722,7 @@
# clear disk cache
unopkg list --shared > /dev/null 2>&1 || :
-%files calc
+%files calc-core
%defattr(-,root,root,-)
%dir %{basisinstdir}
%dir %{basisinstdir}/help
@@ -2461,8 +2743,6 @@
%{basisinstdir}/program/resource/date%{UPD}en-US.res
%{basisinstdir}/program/resource/sc%{UPD}en-US.res
%{basisinstdir}/program/resource/solver%{UPD}en-US.res
-%{oooinstdir}/program/scalc
-%{oooinstdir}/program/scalc.bin
%dir %{basisinstdir}/share
%dir %{basisinstdir}/share/registry
%dir %{basisinstdir}/share/registry/data
@@ -2492,27 +2772,45 @@
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
-%{_datadir}/applications/openoffice.org-*-calc.desktop
%{_datadir}/mimelnk/application/*spreadsheet*
%{_bindir}/oocalc
#vba
%{basisinstdir}/program/libvbaobj%{SOPOST}.uno.so
+%files calc
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/scalc
+%{oooinstdir}/program/scalc.bin
+%{_datadir}/applications/openoffice.org-*-calc.desktop
+
%post calc
update-desktop-database -q %{_datadir}/applications
%postun calc
update-desktop-database -q %{_datadir}/applications
-%files draw
+%files -n broffice.org-calc
+%defattr(-,root,root,-)
+%dir %{brinstdir}
+%dir %{brinstdir}/program
+%{brinstdir}/program/scalc
+%{brinstdir}/program/scalc.bin
+%{_datadir}/applications/broffice.org-calc.desktop
+
+%post -n broffice.org-calc
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-calc
+update-desktop-database -q %{_datadir}/applications
+
+%files draw-core
%defattr(-,root,root,-)
%dir %{basisinstdir}
%dir %{basisinstdir}/help
%dir %{basisinstdir}/help/en
%{basisinstdir}/help/en/sdraw.*
-%dir %{basisinstdir}/program
-%{oooinstdir}/program/sdraw
-%{oooinstdir}/program/sdraw.bin
%dir %{basisinstdir}/share
%dir %{basisinstdir}/share/registry
%dir %{basisinstdir}/share/registry/data
@@ -2540,16 +2838,37 @@
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
-%{_datadir}/applications/openoffice.org-*-draw.desktop
%{_datadir}/mimelnk/application/*drawing*
%{_bindir}/oodraw
+%files draw
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/sdraw
+%{oooinstdir}/program/sdraw.bin
+%{_datadir}/applications/openoffice.org-*-draw.desktop
+
%post draw
update-desktop-database -q %{_datadir}/applications
%postun draw
update-desktop-database -q %{_datadir}/applications
+%files -n broffice.org-draw
+%defattr(-,root,root,-)
+%dir %{brinstdir}
+%dir %{brinstdir}/program
+%{brinstdir}/program/sdraw
+%{brinstdir}/program/sdraw.bin
+%{_datadir}/applications/broffice.org-draw.desktop
+
+%post -n broffice.org-draw
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-draw
+update-desktop-database -q %{_datadir}/applications
+
%files emailmerge
%defattr(-,root,root,-)
%dir %{basisinstdir}
@@ -2564,7 +2883,7 @@
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
-%files writer
+%files writer-core
%defattr(-,root,root,-)
%dir %{basisinstdir}
%dir %{basisinstdir}/help
@@ -2581,8 +2900,6 @@
%dir %{basisinstdir}/program/resource
%{basisinstdir}/program/resource/bf_sw%{UPD}en-US.res
%{basisinstdir}/program/resource/t602filter%{UPD}en-US.res
-%{oooinstdir}/program/swriter
-%{oooinstdir}/program/swriter.bin
%dir %{basisinstdir}/share
%dir %{basisinstdir}/share/registry
%dir %{basisinstdir}/share/registry/data
@@ -2624,19 +2941,38 @@
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
-%{_datadir}/applications/openoffice.org-*-writer.desktop
%{_datadir}/mimelnk/application/*master*
%{_datadir}/mimelnk/application/*text*
%{_datadir}/mimelnk/application/*web*
%{_bindir}/oowriter
+%files writer
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/swriter
+%{oooinstdir}/program/swriter.bin
+%{_datadir}/applications/openoffice.org-*-writer.desktop
+
%post writer
update-desktop-database -q %{_datadir}/applications
%postun writer
update-desktop-database -q %{_datadir}/applications
-%files impress
+%files -n broffice.org-writer
+%defattr(-,root,root,-)
+%{brinstdir}/program/swriter
+%{brinstdir}/program/swriter.bin
+%{_datadir}/applications/broffice.org-writer.desktop
+
+%post -n broffice.org-writer
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-writer
+update-desktop-database -q %{_datadir}/applications
+
+%files impress-core
%defattr(-,root,root,-)
%dir %{basisinstdir}
%dir %{basisinstdir}/help
@@ -2645,8 +2981,6 @@
%dir %{basisinstdir}/program
%{basisinstdir}/program/libanimcore.so
%{basisinstdir}/program/libplaceware*.so
-%{oooinstdir}/program/simpress
-%{oooinstdir}/program/simpress.bin
%dir %{basisinstdir}/share
%dir %{basisinstdir}/share/config
%{basisinstdir}/share/config/soffice.cfg
@@ -2678,17 +3012,38 @@
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
-%{_datadir}/applications/openoffice.org-*-impress.desktop
%{_datadir}/mimelnk/application/*presentation*
%{_bindir}/ooimpress
+%files impress
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/simpress
+%{oooinstdir}/program/simpress.bin
+%{_datadir}/applications/openoffice.org-*-impress.desktop
+
%post impress
update-desktop-database -q %{_datadir}/applications
%postun impress
update-desktop-database -q %{_datadir}/applications
-%files math
+%files -n broffice.org-impress
+%defattr(-,root,root,-)
+%dir %{brinstdir}
+%dir %{brinstdir}/program
+%{brinstdir}/program/simpress
+%{brinstdir}/program/simpress.bin
+%{_datadir}/applications/broffice.org-impress.desktop
+
+%post -n broffice.org-impress
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-impress
+update-desktop-database -q %{_datadir}/applications
+
+%files math-core
%defattr(-,root,root,-)
%dir %{basisinstdir}
%dir %{basisinstdir}/help
@@ -2701,7 +3056,6 @@
%dir %{basisinstdir}/program/resource
%{basisinstdir}/program/resource/bf_sm%{UPD}en-US.res
%{basisinstdir}/program/resource/sm%{UPD}en-US.res
-%{oooinstdir}/program/smath
%dir %{basisinstdir}/share/registry
%dir %{basisinstdir}/share/registry/data
%dir %{basisinstdir}/share/registry/data/org
@@ -2729,16 +3083,35 @@
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
-%{_datadir}/applications/openoffice.org-*-math.desktop
%{_datadir}/mimelnk/application/*formula*
%{_bindir}/oomath
+%files math
+%defattr(-,root,root,-)
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/smath
+%{_datadir}/applications/openoffice.org-*-math.desktop
+
%post math
update-desktop-database -q %{_datadir}/applications
%postun math
update-desktop-database -q %{_datadir}/applications
+%files -n broffice.org-math
+%defattr(-,root,root,-)
+%dir %{brinstdir}
+%dir %{brinstdir}/program
+%{brinstdir}/program/smath
+%{_datadir}/applications/broffice.org-math.desktop
+
+%post -n broffice.org-math
+update-desktop-database -q %{_datadir}/applications
+
+%postun -n broffice.org-math
+update-desktop-database -q %{_datadir}/applications
+
%files graphicfilter
%defattr(-,root,root,-)
%dir %{basisinstdir}
@@ -2880,9 +3253,10 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Tue Apr 08 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
+* Wed Apr 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.4
- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
- migrate system extensions automatically
+- Resolves: rhbz#358021 split up into brand layers and add BrOffice.org
* Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
More information about the fedora-extras-commits
mailing list