rpms/openoffice.org/devel openoffice.org.spec, 1.697, 1.698 workspace.targetedaot.patch, 1.11, 1.12 workspace.cmcfixes25.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed May 10 15:59:13 UTC 2006


Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26137

Modified Files:
	openoffice.org.spec workspace.targetedaot.patch 
Removed Files:
	workspace.cmcfixes25.patch 
Log Message:
remove typo fix


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -r1.697 -r1.698
--- openoffice.org.spec	10 May 2006 15:50:27 -0000	1.697
+++ openoffice.org.spec	10 May 2006 15:59:09 -0000	1.698
@@ -221,7 +221,6 @@
 Patch32: openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
 Patch33: openoffice.org-2.0.3.oooXXXXX.exceptions.sd.patch
 Patch34: openoffice.org-2.0.3.ooo65230.x86_64.automation.patch
-Patch35: workspace.cmcfixes25.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1138,7 +1137,6 @@
 %patch32 -p1 -b .ooo65052.bridges.makeasmpic.patch
 %patch33 -p1 -b .oooXXXXX.exceptions.sd.patch
 %patch34 -p1 -b .ooo65230.x86_64.automation.patch
-%patch35 -p1 -b .workspace.cmcfixes25.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -1183,7 +1181,7 @@
 export CC=gcc4
 export CXX=g++4
 %endif
-%configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-atkbridge --enable-evolution2 --enable-xsltproc --enable-cairo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{extraflags} %{withlang}
+without_afms=yes without_ppds=yes %configure --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-gcjaot --enable-symbols --enable-atkbridge --enable-evolution2 --enable-xsltproc --enable-cairo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --without-ppds --without-afms --with-images=industrial %{extraflags} %{withlang}
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
@@ -3727,7 +3725,6 @@
 - add openoffice.org-2.0.3.ooo64908.sot.extraqual.patch
 - add openoffice.org-2.0.3.gccXXXXX.svtools.R_X86_64_PC32.patch workaround
 - add openoffice.org-2.0.3.ooo65052.bridges.makeasmpic.patch
-- add workspace.cmcfixes25.patch
 
 * Thu Apr 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.13
 - rh#189630# lfs trouble

workspace.targetedaot.patch:
 bin/deliver.pl                               |    0 
 config_office/configure.in                   |   57 +++++++++++++++++----------
 config_office/set_soenv.in                   |    7 ---
 filter/source/config/fragments/makefile.mk   |    4 +
 filter/source/config/tools/merge/makefile.mk |    3 +
 helpcontent2/util/target.pmk                 |   10 ++++
 inc/antsettings.mk                           |    0 
 inc/settings.mk                              |    0 
 inc/target.mk                                |    0 
 inc/tg_jar.mk                                |    0 
 prj/d.lst                                    |    0 
 solenv/bin/deliver.pl                        |   19 ---------
 solenv/inc/antsettings.mk                    |    8 ---
 solenv/inc/settings.mk                       |    4 -
 solenv/inc/target.mk                         |    6 ++
 solenv/inc/tg_jar.mk                         |   14 ++++++
 source/com/sun/star/help/makefile.mk         |    0 
 source/config/fragments/makefile.mk          |    0 
 source/config/tools/merge/makefile.mk        |    0 
 util/target.pmk                              |    0 
 xmlhelp/prj/d.lst                            |    1 
 xmlhelp/source/com/sun/star/help/makefile.mk |    3 +
 22 files changed, 80 insertions(+), 56 deletions(-)

Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- workspace.targetedaot.patch	5 May 2006 10:27:57 -0000	1.11
+++ workspace.targetedaot.patch	10 May 2006 15:59:09 -0000	1.12
@@ -21,15 +21,6 @@
  AC_ARG_WITH(ant-home,
  [  --with-ant-home         If you have installed Jakarta Ant on your system,
                            please supply the path here.
-@@ -386,7 +395,7 @@
- [  --with-nmake-path       For MS Visual Toolkit compiler users, please supply
-                           the path pointing to the nmake.exe. The Platform SDK
-                           provides one in the Win64 directory, usually something
--                          like: /cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
-+                          like: "/cygdrive/c/Programme/Microsoft SDK/Bin/Win64"
-  
-                           Usage: --with-nmake-path=<absolute path to nmake.exe>
- ],,)
 @@ -2102,33 +2111,41 @@
  fi
  


--- workspace.cmcfixes25.patch DELETED ---




More information about the fedora-cvs-commits mailing list