rpms/openoffice.org/devel workspace.cmcfixes50.patch,1.3,1.4

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30877

Modified Files:
	workspace.cmcfixes50.patch 
Log Message:
rats, missing bit

workspace.cmcfixes50.patch:

Index: workspace.cmcfixes50.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes50.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cmcfixes50.patch	16 Sep 2008 07:39:00 -0000	1.3
+++ workspace.cmcfixes50.patch	16 Sep 2008 10:44:59 -0000	1.4
@@ -518,3 +518,90 @@
    else
       AC_MSG_RESULT([internal])
       AC_MSG_CHECKING([for jfreereport module])
+Index: util/makefile.mk
+===================================================================
+RCS file: /cvs/dba/reportbuilder/util/makefile.mk,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 makefile.mk
+--- openoffice.org.orig/reportbuilder/util/makefile.mk	12 Aug 2008 14:14:14 -0000	1.1.1.1
++++ openoffice.org/reportbuilder/util/makefile.mk	16 Sep 2008 10:43:14 -0000
+@@ -68,18 +68,18 @@
+ 
+ # .jar files from solver
+ COMPONENT_EXTJARFILES = \
+-	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
+-	$(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
+-	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
+-	$(EXTENSIONDIR)$/libfonts-0.3.3.jar										\
+-	$(EXTENSIONDIR)$/libformula-0.1.14.jar									\
+-	$(EXTENSIONDIR)$/liblayout-0.2.8.jar										\
+-	$(EXTENSIONDIR)$/libloader-0.3.6.jar										\
+-	$(EXTENSIONDIR)$/librepository-0.1.4.jar									\
+-	$(EXTENSIONDIR)$/libxml-0.9.9.jar										\
+-	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar					\
+-	$(EXTENSIONDIR)$/sac.jar                                                \
+-	$(EXTENSIONDIR)$/sun-report-builder.jar \
++	$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
++	$(EXTENSIONDIR)$/jcommon-1.0.10.jar							\
++	$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
++	$(EXTENSIONDIR)$/libfonts-0.3.3.jar							\
++	$(EXTENSIONDIR)$/libformula-0.1.14.jar						\
++	$(EXTENSIONDIR)$/liblayout-0.2.8.jar						\
++	$(EXTENSIONDIR)$/libloader-0.3.6.jar						\
++	$(EXTENSIONDIR)$/librepository-0.1.4.jar					\
++	$(EXTENSIONDIR)$/libxml-0.9.9.jar							\
++	$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar 	\
++	$(EXTENSIONDIR)$/sac.jar                                 	\
++	$(EXTENSIONDIR)$/sun-report-builder.jar 					\
+ 	$(EXTENSIONDIR)$/reportbuilderwizard.jar
+ 
+ COMPONENT_MANIFEST_GENERIC:=TRUE
+@@ -95,7 +95,47 @@
+ .INCLUDE : extension_post.mk
+ 
+ .IF "$(SYSTEM_JFREEREPORT)" == "YES"
+-$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
++$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar : $(FLUTE_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/jcommon-1.0.10.jar : $(JCOMMON_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar : $(JCOMMON_SERIALIZER_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libfonts-0.3.3.jar : $(LIBFONTS_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libformula-0.1.14.jar : $(LIBFORMULA_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/liblayout-0.2.8.jar : $(LIBLAYOUT_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libloader-0.3.6.jar : $(LIBLOADER_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/librepository-0.1.4.jar : $(LIBREPOSITORY_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/libxml-0.9.9.jar : $(LIBXML_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar : $(JFREEREPORT_JAR)
++	@@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
++
++$(EXTENSIONDIR)$/sac.jar : $(SAC_JAR)
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ .ELSE