rpms/openoffice.org/devel openoffice.org-2.0.1.rh175242.connectivity.mozab.patch, NONE, 1.1 .cvsignore, 1.90, 1.91 openoffice.org.spec, 1.574, 1.575 sources, 1.144, 1.145
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 8 10:08:46 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5063
Modified Files:
.cvsignore openoffice.org.spec sources
Added Files:
openoffice.org-2.0.1.rh175242.connectivity.mozab.patch
Log Message:
next version
openoffice.org-2.0.1.rh175242.connectivity.mozab.patch:
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 8 +++----
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 13 +++++-------
connectivity/source/drivers/mozab/makefile.mk | 14 +++++--------
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 13 +++++-------
scp2/source/ooo/file_library_ooo.scp | 4 +--
source/drivers/mozab/bootstrap/MNSFolders.cxx | 0
source/drivers/mozab/bootstrap/makefile.mk | 0
source/drivers/mozab/makefile.mk | 0
source/drivers/mozab/mozillasrc/makefile.mk | 0
9 files changed, 24 insertions(+), 28 deletions(-)
--- NEW FILE openoffice.org-2.0.1.rh175242.connectivity.mozab.patch ---
Index: source/drivers/mozab/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/makefile.mk,v
retrieving revision 1.20
diff -u -p -u -r1.20 makefile.mk
--- openoffice.org.orig/connectivity/source/drivers/mozab/makefile.mk 8 Sep 2005 06:22:19 -0000 1.20
+++ openoffice.org/connectivity/source/drivers/mozab/makefile.mk 8 Dec 2005 09:58:58 -0000
@@ -38,16 +38,14 @@ PRJNAME=connectivity
TARGET=$(MOZAB_TARGET)
TARGET2=$(MOZAB_TARGET)drv
-.IF ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+.IF "$(WITH_MOZILLA)" == "NO"
all:
- @echo " Not building the mozabsrc stuff in OpenOffice.org build"
- @echo " dependency to Mozilla developer snapshots not feasable at the moment"
- @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
+ @echo " Not building the mozilla address book"
.ENDIF
#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+MOZ_LIB*=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC*=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
#.ENDIF
.IF "$(OS)"=="WNT"
@@ -69,9 +67,9 @@ MOZ_REG_LIB := $(MOZ_LIB)$/mozreg.lib
.IF "$(OS)"=="WNT"
LIB += $(MOZ_LIB)
-MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib
+MOZ_LIB_XPCOM*= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib
.ELSE "$(OS)"=="WNT"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom
+MOZ_LIB_XPCOM*= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom
.ENDIF
#End of mozilla specific stuff.
Index: source/drivers/mozab/bootstrap/MNSFolders.cxx
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx,v
retrieving revision 1.3
diff -u -p -u -r1.3 MNSFolders.cxx
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx 8 Sep 2005 06:22:59 -0000 1.3
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx 8 Dec 2005 09:58:58 -0000
@@ -55,9 +55,9 @@ static char * DefaultProductDir[] =
"Mozilla\\Firefox\\",
"Thunderbird\\"
#else
- ".mozilla\/",
- ".mozilla\/firefox\/",
- ".thunderbird\/"
+ ".mozilla/",
+ ".mozilla/firefox/",
+ ".thunderbird/"
#endif
};
#if defined(XP_MAC) || defined(XP_MACOSX)
@@ -77,7 +77,7 @@ static char * DefaultProductDir[] =
return ::rtl::OString(szPath) + ::rtl::OString("\\");
#elif defined(UNIX)
const char* homeDir = getenv("HOME");
- return ::rtl::OString(homeDir) + ::rtl::OString("\/");
+ return ::rtl::OString(homeDir) + ::rtl::OString("/");
#endif
}
Index: source/drivers/mozab/bootstrap/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk,v
retrieving revision 1.5
diff -u -p -u -r1.5 makefile.mk
--- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/makefile.mk 8 Sep 2005 06:27:00 -0000 1.5
+++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/makefile.mk 8 Dec 2005 09:58:58 -0000
@@ -35,8 +35,9 @@
CALL_CDECL=TRUE
#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+MOZ_LIB*=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC*=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+MOZ_NSPR_CFLAGS*=-I$(MOZ_INC)/nspr
#End of mozilla specific stuff.
PRJ=..$/..$/..$/..
@@ -57,11 +58,9 @@ ENVCFLAGS+=/FR$(SLO)$/
.INCLUDE : settings.mk
-.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+.IF "$(WITH_MOZILLA)" == "NO"
dummy:
- @echo " Not building the mozillasrc stuff in OpenOffice.org build"
- @echo " dependency to Mozilla developer snapshots not feasable at the moment"
-
+ @echo " Not building the mozilla address book"
.ELSE
.INCLUDE : $(PRJ)$/version.mk
@@ -89,7 +88,7 @@ CFLAGS += -features=tmplife
.ENDIF # "$(COMNAME)"=="sunpro5"
.ENDIF
-MOZINC = . -I.. -I..$/mozillasrc -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
+MOZINC = . -I.. -I..$/mozillasrc -I$(MOZ_INC) $(MOZ_NSPR_CFLAGS) -I$(MOZ_INC)$/xpcom \
-I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
Index: source/drivers/mozab/mozillasrc/makefile.mk
===================================================================
RCS file: /cvs/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk,v
retrieving revision 1.17
diff -u -p -u -r1.17 makefile.mk
--- openoffice.org.orig/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 8 Sep 2005 06:31:02 -0000 1.17
+++ openoffice.org/connectivity/source/drivers/mozab/mozillasrc/makefile.mk 8 Dec 2005 09:58:58 -0000
@@ -35,8 +35,9 @@
CALL_CDECL=TRUE
#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+MOZ_LIB*=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC*=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+MOZ_NSPR_CFLAGS*=-I$(MOZ_INC)/nspr
#End of mozilla specific stuff.
PRJ=..$/..$/..$/..
@@ -57,11 +58,9 @@ ENVCFLAGS+=/FR$(SLO)$/
.INCLUDE : settings.mk
-.IF ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO"
+.IF "$(WITH_MOZILLA)" == "NO"
dummy:
- @echo " Not building the mozillasrc stuff in OpenOffice.org build"
- @echo " dependency to Mozilla developer snapshots not feasable at the moment"
- @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"
+ @echo " Not building the mozilla address book"
.ELSE
.INCLUDE : $(PRJ)$/version.mk
@@ -87,7 +86,7 @@ CFLAGS += -features=tmplife
.ENDIF # "$(COMNAME)"=="sunpro5"
.ENDIF
-MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC) -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
+MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC) $(MOZ_NSPR_CFLAGS) -I$(MOZ_INC)$/xpcom \
-I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp 2005-12-08 09:37:22.000000000 +0000
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp 2005-12-08 09:38:15.000000000 +0000
@@ -1211,7 +1211,7 @@
#endif
End
-#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+#if !defined(MACOSX) && !defined(WITHOUT_MOZILLA)
File gid_File_Lib_Mozab_2
TXT_FILE_BODY;
@@ -1229,7 +1229,7 @@
STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
-#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
+#if !defined(MACOSX) && !defined(WITHOUT_MOZILLA)
File gid_File_Lib_Mozabdrv
TXT_FILE_BODY;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- .cvsignore 2 Dec 2005 10:36:48 -0000 1.90
+++ .cvsignore 8 Dec 2005 10:08:43 -0000 1.91
@@ -149,3 +149,4 @@
SRC680_m141.tar.bz2
SRC680_m142.tar.bz2
SRC680_m143.tar.bz2
+SRC680_m144.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- openoffice.org.spec 5 Dec 2005 14:24:25 -0000 1.574
+++ openoffice.org.spec 8 Dec 2005 10:08:43 -0000 1.575
@@ -1,6 +1,6 @@
%define oootag SRC680
-%define ooomilestone 143
-%define rh_rpm_release 3
+%define ooomilestone 144
+%define rh_rpm_release 1
%define build_fc5 1
%define build_fc4 0
@@ -196,6 +196,7 @@
Patch43: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch
Patch44: openoffice.org-2.0.1.ooo58798.parallel.patch
Patch45: workspace.sb41.patch
+Patch46: openoffice.org-2.0.1.rh175242.connectivity.mozab.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -854,6 +855,7 @@
%patch43 -p1 -b .gcc25199.bitfieldaccess.patch
%patch44 -p1 -b .ooo58798.parallel.patch
%patch45 -p1 -b .workspace.sb41.patch
+%patch46 -p1 -b .rh175242.connectivity.mozab.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -2380,6 +2382,7 @@
%{instdir}/program/liblocaledata_euro.so
%{instdir}/program/liblocaledata_others.so
%{instdir}/program/libmcnttype.so
+%{instdir}/program/libmozab*
%{instdir}/program/libmyspell.so
%{instdir}/program/libmysql2.so
%{instdir}/program/libnpsoplugin.so
@@ -3305,6 +3308,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue Dec 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-144.1
+- openoffice.org-2.0.1.rh175242.connectivity.mozab.patch, provide mozilla
+ address backend despite http://bugzilla.mozilla.org/show_bug.cgi?id=135137
+
* Mon Dec 05 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-143.3
- default to evo2 as address book
- add workspace.sb41.patch for gcc 4.1 support
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources 6 Dec 2005 09:47:42 -0000 1.144
+++ sources 8 Dec 2005 10:08:43 -0000 1.145
@@ -6,4 +6,4 @@
33abf0fa04f7ec90b49ba4a8072713b6 GSI_ga.sdf
b96362d6fe9451cffc21da249038a007 openoffice.org-simple-crash_report.sh
1825a3b182fd46e08075a42257cfc6aa gcj-sed.sh
-690e5a5abd436b73bb41846f6c32549b SRC680_m143.tar.bz2
+f089cec0babbd264f93935f980c45165 SRC680_m144.tar.bz2
More information about the fedora-cvs-commits
mailing list