rpms/openoffice.org/devel openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch, 1.4, 1.5 openoffice.org.spec, 1.1195, 1.1196

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6182

Modified Files:
	openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch 
	openoffice.org.spec 
Log Message:
drop db4-java configure test

openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch:

Index: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch	22 Jan 2007 09:27:00 -0000	1.4
+++ openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch	5 Jun 2007 14:58:29 -0000	1.5
@@ -6385,3 +6385,40 @@
 -.ENDIF
 -
 +	HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+diff -ru config_office.orig/configure.in config_office/configure.in
+--- openoffice.org.orig/config_office/configure.in	2007-06-05 15:55:39.000000000 +0100
++++ openoffice.org/config_office/configure.in	2007-06-05 15:56:50.000000000 +0100
+@@ -3031,33 +3031,6 @@
+     #  [AC_MSG_ERROR([db library not installed or functional])], [])
+     AC_HAVE_LIBRARY(db, [],
+       [AC_MSG_ERROR([db not installed or functional])], [])
+-     if test "$SOLAR_JAVA" = "TRUE"; then
+-       if test -z "$DB_JAR"; then
+-         # three different naming methods *grumble* Are there even more?
+-         AC_CHECK_FILE(/usr/share/java/db.jar, [ JARVER=0 ],
+-           [
+-             AC_CHECK_FILE(/usr/share/java/db-$DB_VERSION.jar, [ JARVER=1 ],
+-               [ AC_CHECK_FILE(/usr/share/java/libdb$DB_VERSION-java.jar,
+-                   [ JARVER_LONGSTYLE=1 ],
+-                   [ AC_MSG_ERROR(db$DB_VERSION_MAJOR Java bindings not found)]
+-                 )
+-               ]
+-             )
+-           ]
+-         )
+-         if test "$JARVER" = "1"; then
+-           DB_JAR=/usr/share/java/jar-$DB_VERSION.jar
+-         else
+-           DB_JAR=/usr/share/java/db.jar
+-         fi
+-         if test "$JARVER_LONGSTYLE" = "1"; then
+-           DB_JAR=/usr/share/java/libdb$DB_VERSION-java.jar
+-         fi
+-	  if test -z "$DB_JAR"; then
+-	    AC_MSG_ERROR([libdb $DB_VERSION jar not found. Install it or specify path with --with-db-jar=/path/to/jar])
+-	  fi
+-       fi
+-    fi
+     SCPDEFS="$SCPDEFS -DSYSTEM_DB"
+ else
+     AC_MSG_RESULT([internal])


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -u -r1.1195 -r1.1196
--- openoffice.org.spec	5 Jun 2007 14:16:24 -0000	1.1195
+++ openoffice.org.spec	5 Jun 2007 14:58:29 -0000	1.1196
@@ -1093,7 +1093,7 @@
 cd config_office
 autoconf
 export PATH=$PATH:/usr/sbin
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{release} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt  --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -1103,8 +1103,7 @@
 export nodep=true
 export NO_HIDS=true
 #Set the "This product has been created by..." in Help->About
-export USER="Red Hat, Inc."
-unset USERNAME
+export OOO_VENDOR="Red Hat, Inc."
 #use the RPM_OPT_FLAGS but remove the OOo overridden ones
 for i in $RPM_OPT_FLAGS; do
         case "$i" in