rpms/openoffice.org/devel workspace.srb1.patch, NONE, 1.1 openoffice.org.spec, 1.2077, 1.2078

Caolan McNamara caolanm at fedoraproject.org
Thu Nov 19 09:50:19 UTC 2009


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.srb1.patch 
Log Message:
add workspace.srb1.patch

workspace.srb1.patch:
 java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java |   16 ++++++++++
 util/makefile.mk                                                   |    2 -
 2 files changed, 17 insertions(+), 1 deletion(-)

--- NEW FILE workspace.srb1.patch ---
diff -r bec9b2b2628f -r 47329487e9cf reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java
--- a/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java	Mon Nov 09 14:52:58 2009 +0100
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java	Wed Nov 11 10:36:44 2009 +0100
@@ -35,6 +35,7 @@
 
 import com.sun.star.report.InputRepository;
 import org.pentaho.reporting.libraries.resourceloader.ResourceData;
+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
 import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
 import org.pentaho.reporting.libraries.resourceloader.ResourceLoader;
@@ -169,4 +170,19 @@
     {
         return resourceManager;
     }
+
+    public boolean isSupportedDeserializer(String string)
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public String serialize(ResourceKey rk, ResourceKey rk1) throws ResourceException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
+    public ResourceKey deserialize(ResourceKey rk, String string) throws ResourceKeyCreationException
+    {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
 }
diff -r bec9b2b2628f -r 47329487e9cf reportbuilder/util/makefile.mk
--- a/reportbuilder/util/makefile.mk	Mon Nov 09 14:52:58 2009 +0100
+++ b/reportbuilder/util/makefile.mk	Wed Nov 11 10:36:44 2009 +0100
@@ -32,7 +32,7 @@
 PRJ=..
 PRJNAME=reportbuilder
 TARGET=rpt
-EXTENSION_VERSION_BASE=1.2.0
+EXTENSION_VERSION_BASE=1.2.1
 
 .IF "$(CWS_WORK_STAMP)" == ""
     EXTENSION_VERSION=$(EXTENSION_VERSION_BASE)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2077
retrieving revision 1.2078
diff -u -p -r1.2077 -r1.2078
--- openoffice.org.spec	18 Nov 2009 21:04:06 -0000	1.2077
+++ openoffice.org.spec	19 Nov 2009 09:50:19 -0000	1.2078
@@ -129,6 +129,7 @@ Patch51: workspace.impress183.patch
 Patch52: workspace.hb33patches1.patch
 Patch53: workspace.ause109.patch
 Patch54: openoffice.org-3.2.0.oooxxxxx.fixdbcheck.patch
+Patch55: workspace.srb1.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1651,6 +1652,7 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch52 -p0 -b .workspace.hb33patches1.patch
 %patch53 -p0 -b .workspace.ause109.patch
 %patch54 -p0 -b .fixdbcheck.patch
+%patch55 -p1 -b .workspace.srb1.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4159,7 +4161,7 @@ fi
 %endif
 
 %changelog
-* Tue Nov 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.1
+* Thu Nov 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-5.1
 - next version
 
 * Fri Nov 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-4.3




More information about the fedora-extras-commits mailing list