rpms/openoffice.org/devel workspace.configure18.patch, NONE, 1.1 openoffice.org.spec, 1.803, 1.804
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jul 29 12:58:11 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29877
Modified Files:
openoffice.org.spec
Added Files:
workspace.configure18.patch
Log Message:
add workspace.configure18.patch for firefox-devel
workspace.configure18.patch:
tools/config_office/configure.in | 30 +++++++++++++++---------
tools/config_office/set_soenv.in | 3 ++
util/extensions/source/plugin/util/makefile.pmk | 2 -
xml/xmlsecurity/util/makefile.mk | 9 +++++++
4 files changed, 32 insertions(+), 12 deletions(-)
--- NEW FILE workspace.configure18.patch ---
Index: tools/config_office/configure.in
diff -u tools/config_office/configure.in:1.169 tools/config_office/configure.in:1.166.2.18
--- tools/config_office/configure.in:1.169 Mon Jul 10 12:00:12 2006
+++ tools/config_office/configure.in Sat Jul 15 12:27:33 2006
@@ -3170,29 +3187,36 @@
dnl Check for system mozilla
dnl ===================================================================
AC_MSG_CHECKING([which mozilla to use])
-if test -n "$with_system_mozilla"; then
+if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_MOZILLA=YES
- AC_MSG_CHECKING([whether to use Mozilla or Firefox])
+ AC_MSG_CHECKING([which Mozilla flavour to use])
if test -n "$with_firefox" && test "$with_firefox" != "no"; then
- moz_flavour=firefox
- else
- moz_flavour=mozilla
+ MOZ_FLAVOUR=firefox
+ elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
+ MOZ_FLAVOUR=xulrunner
+ else
+ MOZ_FLAVOUR=mozilla
fi
- tmp=`echo $moz_flavour | $PERL -e 'print ucfirst(<STDIN>);'`
+ tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
AC_MSG_RESULT($tmp)
- PKG_CHECK_MODULES( MOZILLAXPCOM, $moz_flavour-xpcom )
+ PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
if $PKG_CONFIG --exists nspr ; then
PKG_CHECK_MODULES( MOZ_NSPR, nspr )
+ NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`"
+ AC_SUBST(NSPR_LIB)
else
- PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr )
+ PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
fi
PKG_CHECK_MODULES( MOZ_NSS, nss, STANDALONENSS="TRUE", STANDALONENSS="" )
if test -z "$STANDALONENSS"; then
- PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss )
+ PKG_CHECK_MODULES( MOZ_NSS, $MOZ_FLAVOUR-nss )
+ else
+ NSS_LIB="-L`$PKG_CONFIG --variable=libdir nss`"
+ AC_SUBST(NSS_LIB)
fi
save_CPPFLAGS="$CPPFLAGS"
@@ -3208,8 +3232,8 @@
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
- MOZ_INC=`$PKG_CONFIG --variable=includedir $moz_flavour-xpcom`
- MOZ_LIB=`$PKG_CONFIG --variable=libdir $moz_flavour-xpcom`
+ MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
+ MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
@@ -3325,6 +3349,7 @@
fi
AC_SUBST(SYSTEM_MOZILLA)
+AC_SUBST(MOZ_FLAVOUR)
AC_SUBST(MOZ_INC)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
Index: tools/config_office/set_soenv.in
diff -u tools/config_office/set_soenv.in:1.107 tools/config_office/set_soenv.in:1.105.2.7
--- tools/config_office/set_soenv.in:1.107 Wed Jul 5 15:32:39 2006
+++ tools/config_office/set_soenv.in Fri Jul 14 09:17:47 2006
@@ -1695,6 +1691,9 @@
ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" );
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" );
+ToFile( "MOZ_FLAVOUR", "@MOZ_FLAVOUR@", "e" );
+ToFile( "NSPR_LIB", "@NSPR_LIB@", "e" );
+ToFile( "NSS_LIB", "@NSS_LIB@", "e" );
ToFile( "MOZ_INC", "@MOZ_INC@", "e" );
ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" );
ToFile( "MOZ_LIB_XPCOM", "@MOZ_LIB_XPCOM@", "e" );
Index: util/extensions/source/plugin/util/makefile.pmk
diff -u util/extensions/source/plugin/util/makefile.pmk:1.4 util/extensions/source/plugin/util/makefile.pmk:1.4.98.1
--- util/extensions/source/plugin/util/makefile.pmk:1.4 Wed Dec 21 03:14:30 2005
+++ util/extensions/source/plugin/util/makefile.pmk Sun Jun 11 07:40:45 2006
@@ -41,6 +41,6 @@
.IF "$(SYSTEM_MOZILLA)" == "YES"
CFLAGS+=-DSYSTEM_MOZILLA
-PKGCONFIG_MODULES=mozilla-plugin
+PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin
.INCLUDE : pkg_config.mk
.ENDIF
Index: xml/xmlsecurity/util/makefile.mk
diff -u xml/xmlsecurity/util/makefile.mk:1.18 xml/xmlsecurity/util/makefile.mk:1.18.70.1
--- xml/xmlsecurity/util/makefile.mk:1.18 Fri Sep 9 10:46:21 2005
+++ xml/xmlsecurity/util/makefile.mk Sun Jun 11 07:25:30 2006
@@ -108,6 +108,15 @@
$(CPPUHELPERLIB) \
$(XMLOFFLIB)
+.IF "$(SYSTEM_MOZILLA)" == "YES"
+.IF "$(NSPR_LIB)" != ""
+SHL2STDLIBS += $(NSPR_LIB)
+.ENDIF
+.IF "$(NSS_LIB)" != ""
+SHL2STDLIBS += $(NSS_LIB)
+.ENDIF
+.ENDIF
+
.IF "$(CRYPTO_ENGINE)" == "mscrypto"
SHL2STDLIBS+= $(MSCRYPTOLIBS)
.ELSE
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- openoffice.org.spec 28 Jul 2006 16:14:51 -0000 1.803
+++ openoffice.org.spec 29 Jul 2006 12:58:08 -0000 1.804
@@ -126,6 +126,7 @@
Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
Patch61: openoffice.org-2.0.3.ooo65081.sw.layout.patch
Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch63: workspace.configure18.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -919,6 +920,7 @@
%patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
%patch61 -p1 -b .ooo65081.sw.layout.patch
%patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch63 -p1 -b .workspace.configure18.patch
tar xzf %{SOURCE1}
@@ -3504,8 +3506,9 @@
- drop openoffice.org-2.0.3.oooXXXXX.all.ODR.anonymousmembers.patch
- drop openoffice.org-2.0.3.oooXXXXX.sal.importvisibilityasexported.patch
- require dejavu-lgc-fonts, Greek coverage problems begone
-- move to firefox-devel instead of mozilla-devel, --with-firefox
- rh#200512# South African translations
+- move to firefox-devel instead of mozilla-devel, --with-firefox
+ + add workspace.configure18.patch
* Thu Jul 20 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.6
- rh#199535# presentation templates duplicated in zh-CN
More information about the fedora-cvs-commits
mailing list