rpms/openoffice.org/devel workspace.targetedaot.patch,1.4,1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 22 17:43:02 UTC 2006
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.670, 1.671 workspace.targetedaot.patch, 1.3, 1.4
- Next message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.2149, 1.2150 linux-2.6-devmem-xen.patch, 1.2, 1.3 linux-2.6-xen-compile-fixes.patch, 1.7, 1.8 linux-2.6-xen.patch, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22439
Modified Files:
workspace.targetedaot.patch
Log Message:
bad foo
workspace.targetedaot.patch:
bin/deliver.pl | 0
config_office/configure.in | 59 +++++++++++++++++----------
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 | 4 +
inc/settings.mk | 0
inc/target.mk | 0
inc/tg_jar.mk | 0
prj/d.lst | 0
solenv/bin/deliver.pl | 19 --------
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 +
20 files changed, 75 insertions(+), 49 deletions(-)
Index: workspace.targetedaot.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.targetedaot.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- workspace.targetedaot.patch 22 Apr 2006 17:21:41 -0000 1.4
+++ workspace.targetedaot.patch 22 Apr 2006 17:43:00 -0000 1.5
@@ -3,8 +3,8 @@
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.161
diff -u -r1.161 configure.in
---- openoffice.org.orig/config_office/gconfigure.in 29 Mar 2006 12:47:51 -0000 1.161
-+++ openoffice.org/config_office/gconfigure.in 22 Apr 2006 16:24:12 -0000
+--- openoffice.org.orig/config_office/configure.in 29 Mar 2006 12:47:51 -0000 1.161
++++ openoffice.org/config_office/configure.in 22 Apr 2006 16:24:12 -0000
@@ -340,6 +340,15 @@
or XML filters. Use --with-java=gij to enable gij/gcj
as java/javac replacements
@@ -97,8 +97,8 @@
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.97
diff -u -r1.97 set_soenv.in
---- openoffice.org.orig/config_office/gset_soenv.in 7 Apr 2006 08:02:29 -0000 1.97
-+++ openoffice.org/config_office/gset_soenv.in 22 Apr 2006 16:24:14 -0000
+--- openoffice.org.orig/config_office/set_soenv.in 7 Apr 2006 08:02:29 -0000 1.97
++++ openoffice.org/config_office/set_soenv.in 22 Apr 2006 16:24:14 -0000
@@ -78,7 +78,7 @@
$UPD, $SOLARUPD, $WORK_STAMP, $TF_UCB,
$SOLARROOT, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
@@ -139,8 +139,8 @@
RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
retrieving revision 1.17
diff -u -r1.17 makefile.mk
---- openoffice.org.orig/filter/gsource/config/fragments/makefile.mk 16 Mar 2006 11:08:21 -0000 1.17
-+++ openoffice.org/filter/gsource/config/fragments/makefile.mk 22 Apr 2006 16:28:44 -0000
+--- openoffice.org.orig/filter/source/config/fragments/makefile.mk 16 Mar 2006 11:08:21 -0000 1.17
++++ openoffice.org/filter/source/config/fragments/makefile.mk 22 Apr 2006 16:28:44 -0000
@@ -155,7 +155,11 @@
#cmc, hack to workaround the java build requirement
MERGE:=python ../tools/merge/pyAltFCFGMerge
@@ -158,8 +158,8 @@
RCS file: /cvs/framework/filter/source/config/tools/merge/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
---- openoffice.org.orig/filter/gsource/config/tools/merge/makefile.mk 8 Sep 2005 21:35:57 -0000 1.5
-+++ openoffice.org/filter/gsource/config/tools/merge/makefile.mk 22 Apr 2006 16:29:21 -0000
+--- openoffice.org.orig/filter/source/config/tools/merge/makefile.mk 8 Sep 2005 21:35:57 -0000 1.5
++++ openoffice.org/filter/source/config/tools/merge/makefile.mk 22 Apr 2006 16:29:21 -0000
@@ -75,6 +75,9 @@
JARTARGET = $(TARGET).jar
@@ -175,8 +175,8 @@
RCS file: /cvs/documentation/helpcontent2/util/target.pmk,v
retrieving revision 1.13
diff -u -r1.13 target.pmk
---- openoffice.org.orig/helpcontent2/gutil/target.pmk 16 Mar 2006 11:10:20 -0000 1.13
-+++ openoffice.org/helpcontent2/gutil/target.pmk 22 Apr 2006 16:37:36 -0000
+--- openoffice.org.orig/helpcontent2/util/target.pmk 16 Mar 2006 11:10:20 -0000 1.13
++++ openoffice.org/helpcontent2/util/target.pmk 22 Apr 2006 16:37:36 -0000
@@ -50,5 +50,9 @@
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
@@ -192,8 +192,8 @@
RCS file: /cvs/tools/solenv/bin/deliver.pl,v
retrieving revision 1.98
diff -u -r1.98 deliver.pl
---- openoffice.org.orig/solenv/gbin/deliver.pl 13 Jan 2006 16:36:04 -0000 1.98
-+++ openoffice.org/solenv/gbin/deliver.pl 22 Apr 2006 16:38:19 -0000
+--- openoffice.org.orig/solenv/bin/deliver.pl 13 Jan 2006 16:36:04 -0000 1.98
++++ openoffice.org/solenv/bin/deliver.pl 22 Apr 2006 16:38:19 -0000
@@ -744,19 +744,6 @@
return $rc;
};
@@ -239,8 +239,8 @@
RCS file: /cvs/tools/solenv/inc/settings.mk,v
retrieving revision 1.188
diff -u -r1.188 settings.mk
---- openoffice.org.orig/solenv/ginc/settings.mk 9 Mar 2006 14:01:40 -0000 1.188
-+++ openoffice.org/solenv/ginc/settings.mk 22 Apr 2006 16:39:26 -0000
+--- openoffice.org.orig/solenv/inc/settings.mk 9 Mar 2006 14:01:40 -0000 1.188
++++ openoffice.org/solenv/inc/settings.mk 22 Apr 2006 16:39:26 -0000
@@ -188,10 +188,6 @@
#required arguments
JAVAC=$(JAVACOMPILER)
@@ -257,8 +257,8 @@
RCS file: /cvs/tools/solenv/inc/target.mk,v
retrieving revision 1.165
diff -u -r1.165 target.mk
---- openoffice.org.orig/solenv/ginc/target.mk 7 Apr 2006 08:01:46 -0000 1.165
-+++ openoffice.org/solenv/ginc/target.mk 22 Apr 2006 16:39:29 -0000
+--- openoffice.org.orig/solenv/inc/target.mk 7 Apr 2006 08:01:46 -0000 1.165
++++ openoffice.org/solenv/inc/target.mk 22 Apr 2006 16:39:29 -0000
@@ -437,6 +437,11 @@
JARTARGETDEP=$(JARTARGET).dep
JARTARGETDEPN=$(MISC)$/$(JARTARGET).dep
@@ -284,8 +284,8 @@
RCS file: /cvs/tools/solenv/inc/tg_jar.mk,v
retrieving revision 1.18
diff -u -r1.18 tg_jar.mk
---- openoffice.org.orig/solenv/ginc/tg_jar.mk 14 Dec 2005 15:37:35 -0000 1.18
-+++ openoffice.org/solenv/ginc/tg_jar.mk 22 Apr 2006 16:39:30 -0000
+--- openoffice.org.orig/solenv/inc/tg_jar.mk 14 Dec 2005 15:37:35 -0000 1.18
++++ openoffice.org/solenv/inc/tg_jar.mk 22 Apr 2006 16:39:30 -0000
@@ -90,5 +90,19 @@
+cd $(CLASSDIR)$/$(TARGET) && zip -u -rX ..$/$(@:f) $(subst,$(CLASSDIR)$/$(TARGET)$/, $(JARMANIFEST)) $(CHECKZIPRESULT)
.ENDIF # "$(JARMANIFEST)"!=""
@@ -311,8 +311,8 @@
RCS file: /cvs/util/xmlhelp/prj/d.lst,v
retrieving revision 1.13
diff -u -r1.13 d.lst
---- openoffice.org.orig/xmlhelp/gprj/d.lst 16 Jan 2006 12:34:13 -0000 1.13
-+++ openoffice.org/xmlhelp/gprj/d.lst 22 Apr 2006 16:40:37 -0000
+--- openoffice.org.orig/xmlhelp/prj/d.lst 16 Jan 2006 12:34:13 -0000 1.13
++++ openoffice.org/xmlhelp/prj/d.lst 22 Apr 2006 16:40:37 -0000
@@ -1,4 +1,5 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.*
+..\%__SRC%\bin\HelpLinker %_DEST%\bin%_EXT%\HelpLinker
@@ -324,8 +324,8 @@
RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
retrieving revision 1.22
diff -u -r1.22 makefile.mk
---- openoffice.org.orig/xmlhelp/gsource/com/sun/star/help/makefile.mk 16 Mar 2006 11:17:16 -0000 1.22
-+++ openoffice.org/xmlhelp/gsource/com/sun/star/help/makefile.mk 22 Apr 2006 16:40:45 -0000
+--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/makefile.mk 16 Mar 2006 11:17:16 -0000 1.22
++++ openoffice.org/xmlhelp/source/com/sun/star/help/makefile.mk 22 Apr 2006 16:40:45 -0000
@@ -96,6 +96,9 @@
JARCOMPRESS = TRUE
CUSTOMMANIFESTFILE = manifest
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org.spec, 1.670, 1.671 workspace.targetedaot.patch, 1.3, 1.4
- Next message (by thread): rpms/kernel/devel kernel-2.6.spec, 1.2149, 1.2150 linux-2.6-devmem-xen.patch, 1.2, 1.3 linux-2.6-xen-compile-fixes.patch, 1.7, 1.8 linux-2.6-xen.patch, 1.12, 1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list