rpms/openoffice.org/devel openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch, NONE, 1.1 openoffice.org.spec, 1.1462, 1.1463
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Sun Mar 30 11:21:26 UTC 2008
- Previous message (by thread): rpms/mediawiki-openid/devel .cvsignore, 1.2, 1.3 mediawiki-openid.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/xapian-core/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xapian-core.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7658
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
Log Message:
add openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch:
--- NEW FILE openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch ---
Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
retrieving revision 1.18
diff -u -r1.18 makefile.mk
--- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 25 Mar 2008 16:49:16 -0000 1.18
+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 30 Mar 2008 11:13:00 -0000
@@ -104,16 +104,13 @@
$(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
$(LNGLIB) \
- $(HNJLIB)
+ $(HNJLIB) \
+ $(ULINGULIB)
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+= $(ULINGULIB)
-.ELSE
+.IF "$(SYSTEM_HUNSPELL)" == "YES"
SHL1STDLIBS+= $(HUNSPELL_LIBS)
.ENDIF
-
-
# build DLL
SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1IMPLIB= i$(TARGET)
Index: source/lingutil/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
retrieving revision 1.8
diff -u -r1.8 makefile.mk
--- openoffice.org.orig/lingucomponent/source/lingutil/makefile.mk 25 Mar 2008 16:50:17 -0000 1.8
+++ openoffice.org/lingucomponent/source/lingutil/makefile.mk 30 Mar 2008 11:13:00 -0000
@@ -45,14 +45,11 @@
.INCLUDE : settings.mk
-.IF "$(SYSTEM_HUNSPELL)" == "YES"
- at all:
- @echo "Nothing to do here; using system hunspell..."
-.ENDIF
+SLOFILES=$(SLO)$/lingutil.obj
-SLOFILES= \
- $(SLO)$/dictmgr.obj \
- $(SLO)$/lingutil.obj
+.IF "$(SYSTEM_HUNSPELL)" != "YES"
+SLOFILES+=$(SLO)$/dictmgr.obj
+.ENDIF
LIB1TARGET= $(SLB)$/lib$(TARGET).lib
Index: source/spellcheck/spell/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
retrieving revision 1.19
diff -u -r1.19 makefile.mk
--- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk 25 Mar 2008 16:50:55 -0000 1.19
+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk 30 Mar 2008 11:13:00 -0000
@@ -66,15 +66,19 @@
# --- Files --------------------------------------------------------
.IF "$(SYSTEM_HUNSPELL)" != "YES"
-CXXFLAGS += -I..$/hunspell -I..$/..$/lingutil
-CFLAGSCXX += -I..$/hunspell -I..$/..$/lingutil
-CFLAGSCC += -I..$/hunspell -I..$/..$/lingutil
+CXXFLAGS += -I..$/hunspell
+CFLAGSCXX += -I..$/hunspell
+CFLAGSCC += -I..$/hunspell
.ELSE
CXXFLAGS += $(HUNSPELL_CFLAGS)
CFLAGSCXX += $(HUNSPELL_CFLAGS)
CFLAGSCC += $(HUNSPELL_CFLAGS)
.ENDIF
+CXXFLAGS += -I..$/..$/lingutil
+CFLAGSCXX += -I..$/..$/lingutil
+CFLAGSCC += -I..$/..$/lingutil
+
EXCEPTIONSFILES= \
$(SLO)$/sprophelp.obj\
$(SLO)$/sspellimp.obj
@@ -99,13 +103,9 @@
$(SALLIB) \
$(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
- $(LNGLIB)
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+= $(ULINGULIB) $(HUNSPELLLIB)
-.ELSE
-SHL1STDLIBS+= $(HUNSPELLLIB)
-.ENDIF
+ $(LNGLIB) \
+ $(ULINGULIB) \
+ $(HUNSPELLLIB)
# build DLL
SHL1LIBS= $(SLB)$/$(TARGET).lib
Index: source/thesaurus/libnth/makefile.mk
===================================================================
RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
retrieving revision 1.13
diff -u -r1.13 makefile.mk
--- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/makefile.mk 25 Mar 2008 16:51:49 -0000 1.13
+++ openoffice.org/lingucomponent/source/thesaurus/libnth/makefile.mk 30 Mar 2008 11:13:00 -0000
@@ -72,26 +72,19 @@
# --- Files --------------------------------------------------------
-.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
+.IF "$(SYSTEM_HUNSPELL)" == "YES"
CXXFLAGS += $(HUNSPELL_CFLAGS)
CFLAGSCXX += $(HUNSPELL_CFLAGS)
CFLAGSCC += $(HUNSPELL_CFLAGS)
.ENDIF
-.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
-CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS)
-CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS)
-CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS)
+.IF "$(SYSTEM_MYTHES)" != "YES"
+CXXFLAGS += -I..$/mythes
+CFLAGSCXX += -I..$/mythes
+CFLAGSCC += -I..$/mythes
.ENDIF
-.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES"
CXXFLAGS += -I..$/..$/lingutil
CFLAGSCXX += -I..$/..$/lingutil
CFLAGSCC += -I..$/..$/lingutil
-.ENDIF
-.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
-CXXFLAGS += -I..$/mythes -I..$/..$/lingutil
-CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil
-CFLAGSCC += -I..$/mythes -I..$/..$/lingutil
-.ENDIF
EXCEPTIONSFILES= \
$(SLO)$/ntprophelp.obj\
@@ -119,11 +112,10 @@
$(UCBHELPERLIB) \
$(UNOTOOLSLIB) \
$(LNGLIB) \
- $(MYTHESLIB)
+ $(MYTHESLIB) \
+ $(ULINGULIB)
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-SHL1STDLIBS+= $(ULINGULIB)
-.ELSE
+.IF "$(SYSTEM_HUNSPELL)" == "YES"
SHL1STDLIBS+= $(HUNSPELL_LIBS)
.ENDIF
# build DLL
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1462
retrieving revision 1.1463
diff -u -r1.1462 -r1.1463
--- openoffice.org.spec 28 Mar 2008 16:07:07 -0000 1.1462
+++ openoffice.org.spec 30 Mar 2008 11:20:20 -0000 1.1463
@@ -137,6 +137,7 @@
Patch64: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
Patch65: openoffice.org-2.4.0.ooo87204.toolkit.64bitevent.patch
Patch66: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch67: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1118,6 +1119,7 @@
%patch64 -p1 -b .ooo86924.sfx2.iconchanges.patch
%patch65 -p1 -b .ooo87204.toolkit.64bitevent.patch
%patch66 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch67 -p1 -b .ooo87604.fixupsystemhunspell.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2862,11 +2864,12 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
+* Sun Mar 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
- drop integrated workspace.cairotext01.patch
- fix up launchers
- fix up configuration settings without using configimport
- extend selinux bodge to arm, mips and s390
+- add openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
* Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
- extend selinux bodge to ia64
- Previous message (by thread): rpms/mediawiki-openid/devel .cvsignore, 1.2, 1.3 mediawiki-openid.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/xapian-core/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xapian-core.spec, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list