rpms/openoffice.org/FC-3 openoffice.org.spec, 1.60, 1.61 redhat-fixes.patch, 1.33, 1.34
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 6 14:37:07 UTC 2005
Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv9592
Modified Files:
openoffice.org.spec redhat-fixes.patch
Log Message:
- #rh153209# OO Writer crashes on tab-click in Format-Character dialog
- Remove FC4 and RHEL4 bits from specfile since they don't use
this OOo version
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- openoffice.org.spec 4 Apr 2005 17:59:16 -0000 1.60
+++ openoffice.org.spec 6 Apr 2005 14:37:04 -0000 1.61
@@ -37,10 +37,6 @@
%define build_fc2 0
# Fedora Core 3
%define build_fc3 1
-# Red Hat Enterprise Linux 4
-%define build_rhel4 0
-# Fedora Core 4
-%define build_fc4 0
##################################
@@ -107,29 +103,6 @@
%define db4_version 4.2
%endif
-# RHEL4
-%if %{build_rhel4}
-%define DistroName RHEL4
-%define release_extension .6.0.EL4
-%define build_kde 1
-%define build_gtk 1
-%define build_evo2_connector 1
-%define build_startup_notification 1
-%define use_new_mime_stuff 1
-%define db4_version 4.2
-%endif
-
-# FC4
-%if %{build_fc4}
-%define DistroName FedoraCore4
-%define release_extension .7.0
-%define build_kde 1
-%define build_gtk 1
-%define build_evo2_connector 0
-%define build_startup_notification 1
-%define use_new_mime_stuff 1
-%define db4_version 4.3
-%endif
##################################
# Package Info
@@ -237,6 +210,10 @@
# Fix up interaction with IIIMF #rh137398#, #rh144557#
Patch22: patches-vclplug-i18n-gtk-im-keyrelease-fix.diff
+# Don't crash when picking tabs in Format->Character #rh153209#
+# and Debian #284096
+Patch23: patches-OOO_1_1-psprint-nocupsupdates.diff
+
##################################
# Description
##################################
@@ -321,6 +298,7 @@
ln -s %{PATCH20} patches/
ln -s %{PATCH21} patches/OOO_1_1/
ln -s %{PATCH22} patches/vclplug/
+ln -s %{PATCH23} patches/OOO_1_1/
# autogen here only needed when sources come from intermediate CVS releases,
# not release from ooo.ximian.com
@@ -587,9 +565,12 @@
# Changelog
##################################
%changelog
-* Mon Apr 4 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-10
+* Wed Apr 6 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-10
- #rh137398# [iiimgcf] general event handling - gtk_im_context_reset()
- #rh144557# (IIIMF canna) oocalc TAB fails to cancel preedit
+- #rh153209# OO Writer crashes on tab-click in Format-Character dialog
+- Remove FC4 and RHEL4 bits from specfile since they don't use
+ this OOo version
* Thu Mar 3 2005 Dan Williams <dcbw at redhat.com> - 1.1.3-9
- #rh139032# OO Writer crashes when enabling automatic hyphenation in Polish document
redhat-fixes.patch:
bin/build-ooo | 30 ++++++++++++
bin/install-dictionaries | 44 +-----------------
bin/ooo-wrapper.in | 40 ----------------
configure.in | 4 -
patches/OOO_1_1/gui-menu-new-wizard-translations.diff | 39 ---------------
patches/OOO_1_1/sc-filter-hide-filteredrows.diff | 1
patches/OOO_1_1_3/apply | 16 ++++--
7 files changed, 50 insertions(+), 124 deletions(-)
Index: redhat-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/redhat-fixes.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- redhat-fixes.patch 4 Apr 2005 17:59:16 -0000 1.33
+++ redhat-fixes.patch 6 Apr 2005 14:37:04 -0000 1.34
@@ -1,5 +1,5 @@
--- ooo-build-cvs20050205/bin/install-dictionaries.rh 2004-09-17 15:04:23.000000000 -0400
-+++ ooo-build-cvs20050205/bin/install-dictionaries 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/bin/install-dictionaries 2005-04-05 10:12:55.000000000 -0400
@@ -10,59 +10,23 @@
@@ -73,7 +73,7 @@
done
--- ooo-build-cvs20050205/bin/build-ooo.rh 2004-12-20 16:30:32.000000000 -0500
-+++ ooo-build-cvs20050205/bin/build-ooo 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/bin/build-ooo 2005-04-05 10:12:55.000000000 -0400
@@ -103,11 +103,41 @@
# similar that gives child nmake's pain.
unset MAKEFLAGS
@@ -117,7 +117,7 @@
OOO_REBUILD_NEEDED="yes"
OOO_ICONS_VERS_TO_BUILD="$OOO_ICONS_VERS"
--- ooo-build-cvs20050205/bin/ooo-wrapper.in.rh 2004-09-13 16:52:21.000000000 -0400
-+++ ooo-build-cvs20050205/bin/ooo-wrapper.in 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/bin/ooo-wrapper.in 2005-04-05 10:12:55.000000000 -0400
@@ -228,17 +228,12 @@
# Parse command line arguments
my @ooo_argv;
@@ -179,7 +179,7 @@
{
if ( -r "$VersionFile" ) {
--- ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff.rh 2003-09-25 11:05:33.000000000 -0400
-+++ ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1/gui-menu-new-wizard-translations.diff 2005-04-05 10:12:55.000000000 -0400
@@ -3,9 +3,9 @@
RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
retrieving revision 1.13
@@ -236,7 +236,7 @@
+ <prop oor:name="ImageIdentifier" oor:type="xs:string">
+ <value>private:image/3216</value>
--- ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff.rh 2004-10-13 06:32:34.000000000 -0400
-+++ ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1/sc-filter-hide-filteredrows.diff 2005-04-05 10:12:55.000000000 -0400
@@ -7,7 +7,7 @@
- for (i=nStartRow; i<=nEndRow; i++)
- pRowFlags[i] &= ~(CR_HIDDEN | CR_FILTERED);
@@ -247,7 +247,7 @@
+ }
else
--- ooo-build-cvs20050205/patches/OOO_1_1_3/apply.rh 2005-02-02 10:03:28.000000000 -0500
-+++ ooo-build-cvs20050205/patches/OOO_1_1_3/apply 2005-04-04 13:55:03.211947229 -0400
++++ ooo-build-cvs20050205/patches/OOO_1_1_3/apply 2005-04-06 10:30:13.926904963 -0400
@@ -24,7 +24,7 @@
FedoraCore1 : RedHatBase
FedoraCore2 : RedHatBase, FilePickers
@@ -257,17 +257,30 @@
RHEL4 : RedHatBase, FilePickers, Evo2
NovellBase : LinuxCommon, FilePickers, GnomeVFS, GlobalDesktopFiles, NonArkCommon, Evo2, NoRpath, NovellOnly
-@@ -134,8 +134,7 @@
+@@ -134,8 +134,6 @@
# Fix XIM a little (urgh, incomplete)
xim-fixes.diff
-# Fix yet more XIM problems
-xim-fixes2.diff
-+patches-vclplug-i18n-gtk-im-keyrelease-fix.diff
# fix for the RTL languages bug - X#69736
vcl-gtk-rtl-fix.diff
-@@ -753,6 +752,9 @@
+@@ -155,6 +153,13 @@
+ # Make sure that printer changes get noticed #37488, #rh146328#
+ gtk-printer-update-on-focus-change.diff
+
++# Fix IIIMF some more
++patches-vclplug-i18n-gtk-im-keyrelease-fix.diff
++
++# Don't crash when Format->Character is opened and tabs
++# are clicked #rh153209# and Debian #284096
++patches-OOO_1_1-psprint-nocupsupdates.diff
++
+ [ FilePickers ]
+
+ #
+@@ -753,6 +758,9 @@
sw-autopilot-fallback-to-vor.diff
sw-template-fallback-to-english.diff
@@ -277,7 +290,7 @@
# Fix a crasher in online layout mode #rh137969#
sw-online-layout-crash-fix.diff
-@@ -779,7 +781,7 @@
+@@ -779,7 +787,7 @@
sw-menu-syntax-fix.diff
# Make the default translation language be English rather than German
@@ -287,7 +300,7 @@
[ LinuxOnly ]
--- ooo-build-cvs20050205/configure.in.rh 2005-02-01 13:19:41.000000000 -0500
-+++ ooo-build-cvs20050205/configure.in 2005-04-04 13:48:24.000000000 -0400
++++ ooo-build-cvs20050205/configure.in 2005-04-05 10:12:55.000000000 -0400
@@ -94,7 +94,7 @@
specify the suffix to be used on the end of script
names, to allow parallel installation of two versions.
More information about the fedora-cvs-commits
mailing list