rpms/openoffice.org/F-9 openoffice.org-2.4.0.gccXXXXX.wizards.patch, NONE, 1.1 openoffice.org.spec, 1.1470, 1.1471 openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch, 1.5, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Apr 17 14:05:32 UTC 2008
- Previous message (by thread): rpms/gnome-games/devel gnome-games-2.22.1.1-fix-icons.patch, 1.1, 1.2 gnome-games.spec, 1.169, 1.170
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.gccXXXXX.wizards.patch, NONE, 1.1 openoffice.org.spec, 1.1483, 1.1484 workspace.cmcfixes43.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18972
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.4.0.gccXXXXX.wizards.patch
Removed Files:
openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch
Log Message:
lets try this hackaround
openoffice.org-2.4.0.gccXXXXX.wizards.patch:
--- NEW FILE openoffice.org-2.4.0.gccXXXXX.wizards.patch ---
Index: com/sun/star/wizards/agenda/CallWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/agenda/CallWizard.java,v
retrieving revision 1.5
diff -u -r1.5 CallWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/agenda/CallWizard.java 11 Apr 2008 12:33:48 -0000 1.5
+++ openoffice.org/wizards/com/sun/star/wizards/agenda/CallWizard.java 17 Apr 2008 13:57:34 -0000
@@ -50,6 +50,10 @@
*/
public class CallWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.agenda.CallWizard$WizardImplementation";
+ }
+
/**
* Gives a factory for creating the service. This method is called by the
* <code>JavaLoader</code>
@@ -68,7 +72,7 @@
public static XSingleServiceFactory __getServiceFactory(String stringImplementationName, XMultiServiceFactory xMSF, XRegistryKey xregistrykey) {
XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(WizardImplementation.class.getName())) {
+ if (stringImplementationName.equals(getFooName())) {
xsingleservicefactory = FactoryHelper.getServiceFactory(WizardImplementation.class, WizardImplementation.__serviceName, xMSF, xregistrykey);
}
@@ -87,7 +91,7 @@
* @see com.sun.star.comp.loader.JavaLoader#
*/
public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
+ return FactoryHelper.writeRegistryServiceInfo(getFooName(), WizardImplementation.__serviceName, xregistrykey);
}
/**
@@ -216,7 +220,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (WizardImplementation.class.getName());
+ return (getFooName());
}
/**
Index: com/sun/star/wizards/fax/CallWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/fax/CallWizard.java,v
retrieving revision 1.3
diff -u -r1.3 CallWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/fax/CallWizard.java 7 Apr 2006 12:39:55 -0000 1.3
+++ openoffice.org/wizards/com/sun/star/wizards/fax/CallWizard.java 17 Apr 2008 13:57:34 -0000
@@ -21,6 +21,9 @@
* @version $Revision$
*/
public class CallWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.fax.CallWizard$WizardImplementation";
+ }
/**
* Gives a factory for creating the service. This method is called by the
@@ -40,7 +43,7 @@
public static XSingleServiceFactory __getServiceFactory(String stringImplementationName, XMultiServiceFactory xMSF, XRegistryKey xregistrykey) {
XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(WizardImplementation.class.getName())) {
+ if (stringImplementationName.equals(getFooName())) {
xsingleservicefactory = FactoryHelper.getServiceFactory(WizardImplementation.class, WizardImplementation.__serviceName, xMSF, xregistrykey);
}
@@ -59,7 +62,7 @@
* @see com.sun.star.comp.loader.JavaLoader#
*/
public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
+ return FactoryHelper.writeRegistryServiceInfo(getFooName(), WizardImplementation.__serviceName, xregistrykey);
}
/**
@@ -183,7 +186,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (WizardImplementation.class.getName());
+ return (getFooName());
}
/**
Index: com/sun/star/wizards/form/CallFormWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/form/CallFormWizard.java,v
retrieving revision 1.7
diff -u -r1.7 CallFormWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/form/CallFormWizard.java 11 Apr 2008 12:44:52 -0000 1.7
+++ openoffice.org/wizards/com/sun/star/wizards/form/CallFormWizard.java 17 Apr 2008 13:57:34 -0000
@@ -43,6 +43,10 @@
*/
public class CallFormWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.form.CallFormWizard$FormWizardImplementation";
+ }
+
/** Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
* <p>
@@ -58,7 +62,7 @@
*/
public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(String stringImplementationName, com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey xregistrykey) {
com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(FormWizardImplementation.class.getName()))
+ if (stringImplementationName.equals(getFooName()))
xsingleservicefactory = com.sun.star.comp.loader.FactoryHelper.getServiceFactory(FormWizardImplementation.class, FormWizardImplementation.__serviceName, xMSF, xregistrykey);
return xsingleservicefactory;
}
@@ -72,7 +76,7 @@
* registry key accessible.
*/
public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(FormWizardImplementation.class.getName(), FormWizardImplementation.__serviceName, xregistrykey);
+ return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(getFooName(), FormWizardImplementation.__serviceName, xregistrykey);
}
/** This class implements the component. At least the interfaces XServiceInfo,
@@ -188,7 +192,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (FormWizardImplementation.class.getName());
+ return (getFooName());
}
/** Provides a sequence of all types (usually interface types)
Index: com/sun/star/wizards/letter/CallWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/CallWizard.java,v
retrieving revision 1.3
diff -u -r1.3 CallWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/CallWizard.java 7 Apr 2006 12:46:03 -0000 1.3
+++ openoffice.org/wizards/com/sun/star/wizards/letter/CallWizard.java 17 Apr 2008 13:57:34 -0000
@@ -22,6 +22,10 @@
*/
public class CallWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.letter.CallWizard$WizardImplementation";
+ }
+
/**
* Gives a factory for creating the service. This method is called by the
* <code>JavaLoader</code>
@@ -40,7 +44,7 @@
public static XSingleServiceFactory __getServiceFactory(String stringImplementationName, XMultiServiceFactory xMSF, XRegistryKey xregistrykey) {
XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(WizardImplementation.class.getName())) {
+ if (stringImplementationName.equals(getFooName())) {
xsingleservicefactory = FactoryHelper.getServiceFactory(WizardImplementation.class, WizardImplementation.__serviceName, xMSF, xregistrykey);
}
@@ -59,7 +63,7 @@
* @see com.sun.star.comp.loader.JavaLoader#
*/
public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
+ return FactoryHelper.writeRegistryServiceInfo(getFooName(), WizardImplementation.__serviceName, xregistrykey);
}
/**
@@ -183,7 +187,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (WizardImplementation.class.getName());
+ return (getFooName());
}
/**
Index: com/sun/star/wizards/query/CallQueryWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/query/CallQueryWizard.java,v
retrieving revision 1.6
diff -u -r1.6 CallQueryWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/query/CallQueryWizard.java 11 Apr 2008 12:49:04 -0000 1.6
+++ openoffice.org/wizards/com/sun/star/wizards/query/CallQueryWizard.java 17 Apr 2008 13:57:35 -0000
@@ -43,6 +43,10 @@
*/
public class CallQueryWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.query.CallQueryWizard$QueryWizardImplementation";
+ }
+
/** Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
* <p>
@@ -58,7 +62,7 @@
*/
public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(String stringImplementationName, com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey xregistrykey) {
com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(QueryWizardImplementation.class.getName()))
+ if (stringImplementationName.equals(getFooName()))
xsingleservicefactory = com.sun.star.comp.loader.FactoryHelper.getServiceFactory(QueryWizardImplementation.class, QueryWizardImplementation.__serviceName, xMSF, xregistrykey);
return xsingleservicefactory;
}
@@ -72,7 +76,7 @@
* registry key accessible.
*/
public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(QueryWizardImplementation.class.getName(), QueryWizardImplementation.__serviceName, xregistrykey);
+ return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(getFooName(), QueryWizardImplementation.__serviceName, xregistrykey);
}
/** This class implements the component. At least the interfaces XServiceInfo,
@@ -189,7 +193,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (QueryWizardImplementation.class.getName());
+ return (getFooName());
}
/** Provides a sequence of all types (usually interface types)
Index: com/sun/star/wizards/report/CallReportWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/report/CallReportWizard.java,v
retrieving revision 1.24
diff -u -r1.24 CallReportWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/report/CallReportWizard.java 11 Apr 2008 12:50:31 -0000 1.24
+++ openoffice.org/wizards/com/sun/star/wizards/report/CallReportWizard.java 17 Apr 2008 13:57:36 -0000
@@ -47,6 +47,10 @@
* @author Bertram Nolte
*/
public class CallReportWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.report.CallReportWizard$ReportWizardImplementation";
+ }
+
static boolean bWizardstartedalready;
/** Gives a factory for creating the service.
@@ -66,7 +70,7 @@
{
com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
if ( stringImplementationName.equals(
- ReportWizardImplementation.class.getName() ) )
+ getFooName() ) )
xsingleservicefactory = com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
ReportWizardImplementation.class,
ReportWizardImplementation.__serviceName,
@@ -86,7 +90,7 @@
public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey)
{
return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(
- ReportWizardImplementation.class.getName(),
+ getFooName(),
ReportWizardImplementation.__serviceName,
xregistrykey );
}
@@ -234,7 +238,7 @@
*/
public java.lang.String getImplementationName()
{
- return( ReportWizardImplementation.class.getName() );
+ return( getFooName() );
}
/** Provides a sequence of all types (usually interface types)
Index: com/sun/star/wizards/table/CallTableWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/table/CallTableWizard.java,v
retrieving revision 1.6
diff -u -r1.6 CallTableWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/table/CallTableWizard.java 11 Apr 2008 12:55:40 -0000 1.6
+++ openoffice.org/wizards/com/sun/star/wizards/table/CallTableWizard.java 17 Apr 2008 13:57:36 -0000
@@ -43,6 +43,10 @@
*/
public class CallTableWizard {
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.table.CallTableWizard$TableWizardImplementation";
+ }
+
/** Gives a factory for creating the service.
* This method is called by the <code>JavaLoader</code>
* <p>
@@ -58,7 +62,7 @@
*/
public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(String stringImplementationName, com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey xregistrykey) {
com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(TableWizardImplementation.class.getName()))
+ if (stringImplementationName.equals(getFooName()))
xsingleservicefactory = com.sun.star.comp.loader.FactoryHelper.getServiceFactory(TableWizardImplementation.class, TableWizardImplementation.__serviceName, xMSF, xregistrykey);
return xsingleservicefactory;
}
@@ -72,7 +76,7 @@
* registry key accessible.
*/
public static boolean __writeRegistryServiceInfo(com.sun.star.registry.XRegistryKey xregistrykey) {
- return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(TableWizardImplementation.class.getName(), TableWizardImplementation.__serviceName, xregistrykey);
+ return com.sun.star.comp.loader.FactoryHelper.writeRegistryServiceInfo(getFooName(), TableWizardImplementation.__serviceName, xregistrykey);
}
/** This class implements the component. At least the interfaces XServiceInfo,
@@ -187,7 +191,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (TableWizardImplementation.class.getName());
+ return (getFooName());
}
/** Provides a sequence of all types (usually interface types)
Index: com/sun/star/wizards/web/CallWizard.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/web/CallWizard.java,v
retrieving revision 1.10
diff -u -r1.10 CallWizard.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/web/CallWizard.java 11 Apr 2008 13:14:08 -0000 1.10
+++ openoffice.org/wizards/com/sun/star/wizards/web/CallWizard.java 17 Apr 2008 13:57:36 -0000
@@ -51,6 +51,10 @@
* @version $Revision$
*/
public class CallWizard {
+
+ public static java.lang.String getFooName() {
+ return "com.sun.star.wizards.web.CallWizard$WizardImplementation";
+ }
/**
* Gives a factory for creating the service. This method is called by the
@@ -70,7 +74,7 @@
public static XSingleServiceFactory __getServiceFactory(String stringImplementationName, XMultiServiceFactory xMSF, XRegistryKey xregistrykey) {
XSingleServiceFactory xsingleservicefactory = null;
- if (stringImplementationName.equals(WizardImplementation.class.getName())) {
+ if (stringImplementationName.equals(getFooName())) {
xsingleservicefactory = FactoryHelper.getServiceFactory(WizardImplementation.class, WizardImplementation.__serviceName, xMSF, xregistrykey);
}
@@ -89,7 +93,7 @@
* @see com.sun.star.comp.loader.JavaLoader#
*/
public static boolean __writeRegistryServiceInfo(XRegistryKey xregistrykey) {
- return FactoryHelper.writeRegistryServiceInfo(WizardImplementation.class.getName(), WizardImplementation.__serviceName, xregistrykey);
+ return FactoryHelper.writeRegistryServiceInfo(getFooName(), WizardImplementation.__serviceName, xregistrykey);
}
/**
@@ -240,7 +244,7 @@
* @return Class name of the component.
*/
public java.lang.String getImplementationName() {
- return (WizardImplementation.class.getName());
+ return (getFooName());
}
/**
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1470
retrieving revision 1.1471
diff -u -r1.1470 -r1.1471
--- openoffice.org.spec 16 Apr 2008 13:33:23 -0000 1.1470
+++ openoffice.org.spec 17 Apr 2008 14:04:57 -0000 1.1471
@@ -151,9 +151,7 @@
Patch78: openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
Patch79: openoffice.org-3.0.0.ooo87991.fpickersafe.patch
Patch80: openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
-%if ! %{jdk_is_gcj}
-Patch81: openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch
-%endif
+Patch81: openoffice.org-2.4.0.gccXXXXX.wizards.patch
%define instdir %{_libdir}/openoffice.org
@@ -1119,9 +1117,7 @@
%patch78 -p1 -b .ooo85691.vcl.tooltipcolor.patch
%patch79 -p1 -b .ooo87991.fpickersafe.patch
%patch80 -p1 -b .ooo88033.svx.a11ycrash.patch
-%if ! %{jdk_is_gcj}
-%patch81 -p1 -b .oooXXXXX.config_office.ppc.patch
-%endif
+%patch81 -p1 -b .gccXXXXX.wizards.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1236,19 +1232,18 @@
cd instsetoo_native/util
#get an unpackaged raw install
export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
-if ! dmake openoffice_en-US; then
- echo installation failure time is `date`, diskspace: `df -h . | tail -n 1`
- echo - ---dump log start---
- cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
- echo - ---dump log end---
- echo - ---dump jars begin---
- for i in ../../solver/680/*/bin/*.jar; do unzip -l $i; done
- echo - ---dump jars end---
- rm -rf ../../solver/680/*/bin/*.jar
- unset MAXPROCESS
- build --dlv_switch -link --all
- dmake openoffice_en-US
-fi
+for attempt in 1 2 3; do
+ echo Attempt $attempt
+ if ! dmake openoffice_en-US; then
+ echo installation failure time is `date`, diskspace: `df -h . | tail -n 1`
+ echo - ---dump log start---
+ cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*_en-US.log
+ echo - ---dump log end---
+ dmake openoffice_en-US
+ else
+ break
+ fi
+done
cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
@@ -2906,12 +2901,12 @@
%changelog
-* Tue Apr 15 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
+* Thu Apr 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.6
- Resolves: rhbz#439727 find another crasher
- Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch
- Resolves: rhbz#441108 openoffice.org-3.0.0.ooo87991.fpickersafe.patch
- Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
-- add openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch to try and build
+- add openoffice.org-2.4.0.gccXXXXX.wizards.patch to try and build
* Wed Apr 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-12.5
- Resolves: rhbz#439727 find crasher
--- openoffice.org-2.3.0.oooXXXXX.config_office.ppc.patch DELETED ---
- Previous message (by thread): rpms/gnome-games/devel gnome-games-2.22.1.1-fix-icons.patch, 1.1, 1.2 gnome-games.spec, 1.169, 1.170
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.4.0.gccXXXXX.wizards.patch, NONE, 1.1 openoffice.org.spec, 1.1483, 1.1484 workspace.cmcfixes43.patch, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list