rpms/openoffice.org/devel AutoSaveCommon.xcu, NONE, 1.1 RegisterAndLicence.xcu, NONE, 1.1 openoffice.org-simple-crash_report.sh, NONE, 1.1 openoffice.org.spec, 1.1034, 1.1035 sources, 1.223, 1.224
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 9 19:08:45 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23640
Modified Files:
openoffice.org.spec sources
Added Files:
AutoSaveCommon.xcu RegisterAndLicence.xcu
openoffice.org-simple-crash_report.sh
Log Message:
spec cleanups
--- NEW FILE AutoSaveCommon.xcu ---
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Common" oor:package="org.openoffice.Office">
<node oor:name="Save">
<node oor:name="Document">
<prop oor:name="AutoSave" oor:type="xs:boolean">
<value>true</value>
</prop>
<prop oor:name="AutoSaveTimeIntervall" oor:type="xs:int">
<value>5</value>
</prop>
</node>
</node>
</oor:component-data>
--- NEW FILE RegisterAndLicence.xcu ---
<?xml version="1.0"?>
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Setup" oor:package="org.openoffice">
<node oor:name="Office">
<prop oor:name="LicenseAcceptDate" oor:type="xs:string"><value>3005-01-21T19:56:39</value></prop>
<prop oor:name="FirstStartWizardCompleted" oor:type="xs:boolean"><value>true</value></prop>
</node>
</oor:component-data>
--- NEW FILE openoffice.org-simple-crash_report.sh ---
#!/bin/sh
while [ "$1" != "-stack" ]; do
shift
done
filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
echo "(I) x.org loaded video driver of..." > $filename
grep drivers `(xset -q || echo " Log file: /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-` >> $filename
echo "(III) Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
echo "(IV) libgcj version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH} ' libgcj` >> $filename
echo "(V) kernel is:" `uname -s -r -v -m -p -i` >> $filename
echo "(VI) OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
echo "(VII)`xdpyinfo | grep "depth of root window:"`" >> $filename
echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
if [ -e /etc/fedora-release ]; then
echo "(VIV) fedora release is:" `cat /etc/fedora-release` >> $filename
fi
echo "...start free space details ..." >> $filename
df -k /home /tmp
echo "...end free space details ..." >> $filename
if [ -e /usr/sbin/sestatus ]; then
echo "...start sestatus details ..." >> $filename
/usr/sbin/sestatus >> $filename
echo "...end sestatus details ..." >> $filename
fi
echo "...start stackreport details ..." >> $filename
if [ -e /usr/bin/c++filt ]; then
cat $2 | c++filt >> $filename
else
cat $2 >> $filename
fi
rm $2
echo "...end stackreport details ..." >> $filename
echo "...start sample ldd details ..." >> $filename
ldd /usr/lib*/openoffice.org/program/libreg.so.3 >> $filename
echo "...end sample ldd details ..." >> $filename
echo
echo ---start copy and paste here---
cat $filename
echo ---end copy and paste here---
echo paste the above into your bug report
if [ -e /usr/bin/zenity ]; then
zenity --width=800 --height=600 --title="OOo has crashed!: Paste this text into your bugreport" --text-info --filename=$filename
fi
rm -f $filename
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -r1.1034 -r1.1035
--- openoffice.org.spec 8 Feb 2007 16:40:09 -0000 1.1034
+++ openoffice.org.spec 9 Feb 2007 19:08:43 -0000 1.1035
@@ -1,6 +1,6 @@
%define oootag OOF680
%define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# gcc#19664#
%define stlvisibilityfcked 1
@@ -35,92 +35,88 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: %{ooo_base_name}.tar.bz2
Source1: openoffice.org-myspell-contrib.tar.gz
-Source2: openoffice.org-simple-crash_report.sh
-Source3: RegisterAndLicence.xcu
-Source4: evolocal.odb
-Source5: Tigert-templates.tar.gz
-Source6: documentation.openoffice.org-templates.tar.gz
-Source7: redhat-templates.tar.gz
-Source8: AutoSaveRecovery.xcu
-Source9: AutoSaveCommon.xcu
-Source10: ooo64726.sdf
-Source11: openoffice.org.langpack.template.tar.gz
-BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils, prelink
-BuildRequires: autoconf, make >= 3.79.1, flex, bison, perl-Compress-Zlib
-BuildRequires: gcc, gcc-c++ >= 4.1.1, binutils, gcc-java >= 4.1.1
-BuildRequires: libgcj-devel >= 4.0.2, java-1.4.2-gcj-compat-devel, zlib-devel
-BuildRequires: freetype-devel, gtk2-devel >= 2.9.4, gnome-vfs2-devel
-BuildRequires: cups-devel, curl-devel, boost-devel >= 1.31.0, python-devel
-BuildRequires: expat-devel, libxml2-devel, neon-devel >= 0.24, libidn-devel
-BuildRequires: pam-devel, libjpeg-devel, sane-backends-devel, libXt-devel
-BuildRequires: libICE-devel, evolution-data-server-devel, libxslt-devel,
-BuildRequires: desktop-file-utils >= 0.9, libxslt-devel, unixODBC-devel
-BuildRequires: db4-devel, db4-java >= 4.3.28-3, firefox-devel, hunspell-devel
-BuildRequires: libwpd-devel >= 0.8.0, icu >= 3.6, hsqldb >= 1.80.1
-BuildRequires: bsh >= 1.3.0, xalan-j2, xerces-j2 libicu-devel >= 3.6,
-BuildRequires: ant, perl-Archive-Zip
-
-Patch0: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
-Patch1: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch2: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
-Patch3: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch4: openoffice.org-1.9.97.rh156067.noversionedicons.patch
-Patch5: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
+Source2: http://svn.gnome.org/viewcvs/*checkout*/ooo-build/trunk/src/evolocal.odb
+Source3: http://people.redhat.com/caolanm/templates/Tigert-templates.tar.gz
+Source4: documentation.openoffice.org-templates.tar.gz
+Source5: http://people.redhat.com/caolanm/templates/redhat-templates.tar.gz
+Source6: http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
+Source7: openoffice.org.langpack.template.tar.gz
+BuildRequires: tcsh, zip, findutils, prelink autoconf, flex, bison, ant, icu
+BuildRequires: perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
+BuildRequires: libgcj-devel, java-1.4.2-gcj-compat-devel, zlib-devel, xerces-j2
+BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
+BuildRequires: curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
+BuildRequires: libxml2-devel, neon-devel, libidn-devel, pam-devel, hsqldb
+BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
+BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils
+BuildRequires: libxslt-devel, db4-devel, db4-java, firefox-devel, libwpd-devel
+BuildRequires: libicu-devel, perl-Archive-Zip
+
+Patch0: openoffice.org-simple-crash_report.sh
+Patch1: AutoSaveRecovery.xcu
+Patch2: RegisterAndLicence.xcu
+Patch3: AutoSaveCommon.xcu
+Patch4: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
+Patch5: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch6: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
+Patch7: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
+Patch8: openoffice.org-1.9.97.rh156067.noversionedicons.patch
+Patch9: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
%if %{gtkprintui}
-Patch6: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch10: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch7: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch8: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch9: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch11: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
+Patch12: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch13: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
%if %{langpacks}
-Patch10: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
+Patch14: openoffice.org-1.9.84.rhXXXXXX.lingucomponent.contribdict.patch
%endif
-Patch11: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch12: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch13: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch14: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch16: workspace.libxslt02.patch
-Patch17: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch18: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch19: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch20: workspace.fpicker6.patch
-Patch21: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch22: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
-Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch24: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch25: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch26: ooobuild.VBAObjects.patch
-Patch27: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch28: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch29: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch30: pseudoworkspace.valgrind1.patch
-Patch31: workspace.thbpp6.patch
-Patch32: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch33: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch34: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch35: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch36: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch37: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch38: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch39: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch40: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
-Patch41: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch42: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch43: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch44: workspace.tl37.patch
-Patch45: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch46: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch47: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch48: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
-Patch49: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch50: workspace.cmcfixes32.patch
-Patch51: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch52: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch53: openoffice.org-2.2.0.oooXXXXX.binfilter.toodeep.patch
-Patch54: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
-Patch55: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch56: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
+Patch15: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch17: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
+Patch18: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch19: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch20: workspace.libxslt02.patch
+Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch22: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch23: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch24: workspace.fpicker6.patch
+Patch25: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
+Patch26: openoffice.org-2.0.2.ooo59127.vcl.honourcairofont.patch
+Patch27: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch28: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch29: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch30: ooobuild.VBAObjects.patch
+Patch31: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch32: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+Patch33: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch34: pseudoworkspace.valgrind1.patch
+Patch35: workspace.thbpp6.patch
+Patch36: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch37: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch38: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
+Patch39: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
+Patch40: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch41: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
+Patch42: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch43: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
+Patch44: openoffice.org-2.1.0.oooXXXXX.lingucomponent.systemhunspell.patch
+Patch45: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch46: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch47: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
+Patch48: workspace.tl37.patch
+Patch49: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch50: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch51: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch52: openoffice.org-2.1.0.oooXXXXX.vcl.makenotdefglyph.patch
+Patch53: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
+Patch54: workspace.cmcfixes32.patch
+Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
+Patch57: openoffice.org-2.2.0.oooXXXXX.binfilter.toodeep.patch
+Patch58: openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch
+Patch59: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch60: openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
%define instdir %{_libdir}/openoffice.org
@@ -310,14 +306,14 @@
Summary: Software Development Kit for %{name}
Group: Development/Libraries
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: unzip, java-1.4.2-gcj-compat-devel, make, gcc-c++
+Requires: unzip, java-1.4.2-gcj-compat-devel
%description sdk
The %{name} SDK is an add-on for the %{name} office suite. It provides the necessary tools for programming using the %{name} APIs and for creating extensions (UNO components) for %{name}.
%package sdk-doc
Summary: Software Development Kit documentation for %{name}
-Group: Development/Libraries
+Group: Documentation
Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
%description sdk-doc
@@ -1133,84 +1129,76 @@
%prep
%setup -q -n %{ooo_base_name}
-%patch0 -p1 -b .rh133741.alwaysgtk.desktop.patch
-%patch1 -p1 -b .rh161886.rpath.desktop.patch
-%patch2 -p1 -b .rh151357.setlangtolocale.patch
-%patch3 -p1 -b .rh151356.usetwodotzeropath.patch
-%patch4 -p1 -b .rh156067.noversionedicons.patch
-%patch5 -p1 -b .rhXXXXXX.redhatcolours.extras.patch
+%patch4 -p1 -b .rh133741.alwaysgtk.desktop.patch
+%patch5 -p1 -b .rh161886.rpath.desktop.patch
+%patch6 -p1 -b .rh151357.setlangtolocale.patch
+%patch7 -p1 -b .rh151356.usetwodotzeropath.patch
+%patch8 -p1 -b .rh156067.noversionedicons.patch
+%patch9 -p1 -b .rhXXXXXX.redhatcolours.extras.patch
%if %{gtkprintui}
-%patch6 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch10 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch7 -p1 -b .rh156677.cripplemenus.sysui.patch
-%patch8 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch9 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch11 -p1 -b .rh156677.cripplemenus.sysui.patch
+%patch12 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch13 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
%if %{langpacks}
-%patch10 -p1 -b .rhXXXXXX.lingucomponent.contribdict.patch
+%patch14 -p1 -b .rhXXXXXX.lingucomponent.contribdict.patch
%endif
-%patch11 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch12 -p1 -b .ooo54603.fontconfig.patch
-%patch13 -p1 -b .ooo51931.fixxmlsec.patch
-%patch14 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch16 -p1 -b .workspace.libxslt02.patch
-%patch17 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch18 -p1
-%patch19 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch20 -p1 -b .workspace.fpicker6.patch
-%patch21 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch22 -p1 -b .ooo59127.vcl.honourcairofont.patch
-%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch24 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch25 -p1 -b .rh187919.gtkunderkde.patch
-%patch26 -p0 -b .ooobuild.VBAObjects.patch
-%patch27 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch28 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch29 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch30 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch31 -p1 -b .workspace.thbpp6.patch
-%patch32 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch33 -p1 -b .rh217065.syncbackspace.patch
-%patch34 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch35 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch36 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch37 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH38} >> svtools/source/dialogs/localize.sdf
-%patch39 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch40 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
-%patch41 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch42 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch43 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch44 -p1 -b .tl37.patch
-%patch45 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch46 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch47 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch48 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
-%patch49 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch50 -p1 -b .workspace.cmcfixes32.patch
-%patch51 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch52 -p1 -b .ooo73974.bridges.doublereturn.patch
-# %patch53 -p1 -b .oooXXXXX.binfilter.toodeep.patch
-%patch54 -p1 -b .oooXXXXX.atkthreads.atexit.patch
-%patch55 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch56 -p1 -b .ooo74255.vcl.depth.mismatch.patch
+%patch15 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch16 -p1 -b .ooo54603.fontconfig.patch
+%patch17 -p1 -b .ooo51931.fixxmlsec.patch
+%patch18 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%patch19 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch20 -p1 -b .workspace.libxslt02.patch
+%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch22 -p1
+%patch23 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch24 -p1 -b .workspace.fpicker6.patch
+%patch25 -p1 -b .oooXXXXX.selinux.bridges.patch
+%patch26 -p1 -b .ooo59127.vcl.honourcairofont.patch
+%patch27 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch28 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch29 -p1 -b .rh187919.gtkunderkde.patch
+%patch30 -p0 -b .ooobuild.VBAObjects.patch
+%patch31 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch32 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
+%patch33 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch34 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch35 -p1 -b .workspace.thbpp6.patch
+%patch36 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch37 -p1 -b .rh217065.syncbackspace.patch
+%patch38 -p1 -b .ooo70155.fasterhelplinking.patch
+%patch39 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
+%patch40 -p1 -b .ooo65491.psprint.enablenups.patch
+%patch41 -p1 -b .ooo61812.svx.a11ycrash.patch
+cat %{PATCH42} >> svtools/source/dialogs/localize.sdf
+%patch43 -p1 -b .ooo72014.officecfg.malayammenu.patch
+%patch44 -p1 -b .oooXXXXX.lingucomponent.systemhunspell.patch
+%patch45 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch46 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch47 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch48 -p1 -b .tl37.patch
+%patch49 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch50 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch51 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch52 -p1 -b .oooXXXXX.vcl.makenotdefglyph.patch
+%patch53 -p1 -b .ooo73866.javaunohelper.parallel.patch
+%patch54 -p1 -b .workspace.cmcfixes32.patch
+%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
+# %patch57 -p1 -b .oooXXXXX.binfilter.toodeep.patch
+%patch58 -p1 -b .oooXXXXX.atkthreads.atexit.patch
+%patch59 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch60 -p1 -b .ooo74255.vcl.depth.mismatch.patch
%if %{langpacks}
tar xzf %{SOURCE1}
%endif
-cp %{SOURCE4} extras/source/database/evolocal.odb
+cp %{SOURCE2} extras/source/database/evolocal.odb
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
-if [ -z "$RPM_BUILD_NCPUS" ] ; then
- if [ -x /usr/bin/getconf ] ; then
- RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
- if [ $RPM_BUILD_NCPUS -eq 0 ]; then
- RPM_BUILD_NCPUS=1
- fi
- fi
-fi
#don't build localized helps which are poorly translated
POORHELPS=`grep "Working With %PRODUCTNAME" helpcontent2/source/text/swriter/localize.sdf | cut -f 10 | xargs`
touch external/unowinreg/unowinreg.dll
@@ -1226,21 +1214,11 @@
#faster build
export nodep=true
export NO_HIDS=true
-#enable parallel build
-export MAXPROCESSLIMIT=65535
-export MAXPROCESS=$RPM_BUILD_NCPUS
-#we'll build with at least build -P2 so we can do something useful while
-#helpcontent2 is wasting our time
-export MAXBUILDS=$RPM_BUILD_NCPUS
-if [ $MAXBUILDS -lt 2 ]; then
- export MAXBUILDS=2
-fi
#Set the "This product has been created by..." in Help->About
export USER="Red Hat, Inc."
unset USERNAME
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
-
#use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do
case "$i" in
@@ -1248,18 +1226,22 @@
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
-export ARCH_FLAGS
+export ARCH_FLAGS="$ARCH_FLAGS -fno-omit-frame-pointer -D_FILE_OFFSET_BITS=64"
+#convert _smp_mflags to dmake equivalent
+SMP_MFLAGS=%{?_smp_mflags}
+SMP_MFLAGS=${SMP_MFLAGS/-j/-P}
+#just in case you have a >16 proc box
+export MAXPROCESSLIMIT=65535
-# see tamil translation issue rh#159381#, remove when complete and upstreamed
+# remove when these translations are fixed upstreamed
cd transex3/prj
-build --dlv_switch -link --all -P$MAXBUILDS -- -s
+build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
deliver -link
-localize -m -x -l bn -f %{SOURCE10}
+localize -m -x -l bn -f %{SOURCE6}
cd ../..
cd instsetoo_native/util
-build --dlv_switch -link --all -P$MAXBUILDS -- -s
+build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
#get an unpackaged raw install
export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
@@ -1328,10 +1310,10 @@
%install
#add our custom configuration options
#default GTK fpicker
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE3}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
#default autosave settings
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE8}
-$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE9}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
+$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
#rh#158977# clear execstack requirement
execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
@@ -1390,7 +1372,7 @@
st help nodict nolingu western ss nohelp nodict nolingu western \
nr help nodict nolingu western ns help nodict nolingu western \
)
-tar xzf %{SOURCE11}
+tar xzf %{SOURCE7}
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
@@ -1501,9 +1483,9 @@
popd
#add in some templates
+tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{instdir}/share
+tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{instdir}/share
tar xzf %{SOURCE5} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE6} -C $RPM_BUILD_ROOT/%{instdir}/share
-tar xzf %{SOURCE7} -C $RPM_BUILD_ROOT/%{instdir}/share
#skip the swahelli for now
rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ*
@@ -1560,7 +1542,7 @@
if [ $executable == 1 ]; then false; fi
#add in a simple crash reporter replacement
-cp -f %{SOURCE2} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
+cp -f %{PATCH0} $RPM_BUILD_ROOT/%{instdir}/program/crash_report
chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report
#make up some /usr/bin scripts
@@ -2826,6 +2808,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Feb 09 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-6.3
+- spec cleanups
+
* Wed Feb 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-6.2
- Resolves: rhbz#221214 openoffice.org-2.2.0.ooo74255.vcl.depth.mismatch.patch
- Resolves: rhbz#227224 package the sdk
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- sources 7 Feb 2007 15:16:58 -0000 1.223
+++ sources 9 Feb 2007 19:08:43 -0000 1.224
@@ -1,13 +1,8 @@
-a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu
16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
-5a7c718e63d09f42fd40017b28dffd10 AutoSaveCommon.xcu
-d57f21d70ba34ddb20f40a4d08427722 AutoSaveRecovery.xcu
-cba51824724ada973394d8feecdd0213 pa-IN-179.sdf
26c72b57608d21c7cccf941f1df2aea9 redhat-templates.tar.gz
b32a3c75ca5d6fe7249cd63dc358c421 openoffice.org.langpack.template.tar.gz
-a94ebe7733a245f033375a842b407c53 openoffice.org-simple-crash_report.sh
ecd3e4a6677056f340ddb209c442cb4d openoffice.org-myspell-contrib.tar.gz
bac808f8f7137db955308963fdd1f3a7 OOF680_m6.tar.bz2
More information about the fedora-cvs-commits
mailing list