commit OpenOffice_org

30 Aug 2008

Hello community,

here is the log from the commit of package OpenOffice_org
checked in at Sat Aug 30 02:27:58 CEST 2008.


--------

--- arch/i386/OpenOffice_org/OpenOffice_org.changes	2008-08-27 14:05:30.000000000 +0200
+++ OpenOffice_org/OpenOffice_org.changes	2008-08-29 16:31:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 29 16:30:49 CEST 2008 - pmladek@suse.cz
+
+- added libexpat-devel to BuildRequires
+- fixed build with mono 2.0
+
+-------------------------------------------------------------------
--- arch/i386/OpenOffice_org/OpenOffice_org-icon-themes.changes	2008-08-26 22:18:29.000000000 +0200
+++ OpenOffice_org/OpenOffice_org-icon-themes.changes	2008-08-29 18:15:09.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 29 18:12:59 CEST 2008 - pmladek@suse.cz
+
+- added build dependency on exact version of
+  OpenOffice_org-icon-themes-prebuilt to avoid inconsistent state [bnc#421559]
+
+-------------------------------------------------------------------
--- arch/i386/OpenOffice_org/OpenOffice_org-l10n-group1.changes	2008-08-26 22:18:19.000000000 +0200
+++ OpenOffice_org/OpenOffice_org-l10n-group1.changes	2008-08-29 16:31:38.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 29 16:30:49 CEST 2008 - pmladek@suse.cz
+
+- added libexpat-devel to BuildRequires
+- fixed build with mono 2.0
+
+-------------------------------------------------------------------
OpenOffice_org-l10n-group2.changes: same change



Old:
----
  minmem

New:
----
  ooo-build-3.0.0.2-mono-2.0.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ OpenOffice_org-icon-themes.spec ++++++
--- /var/tmp/diff_new_pack.U32055/_old	2008-08-30 02:24:24.000000000 +0200
+++ /var/tmp/diff_new_pack.U32055/_new	2008-08-30 02:24:24.000000000 +0200
@@ -19,14 +19,14 @@
 
 
 Name:           OpenOffice_org-icon-themes
-BuildRequires:  OpenOffice_org-icon-themes-prebuilt
+Version:        3.0.0.2
+Release:        5
+BuildRequires:  OpenOffice_org-icon-themes-prebuilt = %version
 %define	      ooo_build_version 3.0.0.2
 %define	      ooo_basis_dir	basis3.0
 %define	      ooo_home		ooo3
 License:        LGPL v2.1 only; LGPL v3 only
 Group:          Productivity/Office/Suite
-Version:        3.0.0.2
-Release:        1
 AutoReqProv:    on
 Provides:       OpenOffice_org:%_libdir/%ooo_home/share/config/images.zip
 Summary:        Icon Themes for OpenOffice.org
@@ -61,6 +61,9 @@
 %_datadir/%ooo_home
 
 %changelog
+* Fri Aug 29 2008 pmladek@suse.cz
+- added build dependency on exact version of
+  OpenOffice_org-icon-themes-prebuilt to avoid inconsistent state [bnc#421559]
 * Wed Aug 27 2008 pmladek@suse.cz
 - updated to version 3.0.0.2
 * Thu Aug 21 2008 pmladek@suse.cz

++++++ OpenOffice_org-l10n-group1.spec ++++++
--- /var/tmp/diff_new_pack.U32055/_old	2008-08-30 02:24:24.000000000 +0200
+++ /var/tmp/diff_new_pack.U32055/_new	2008-08-30 02:24:24.000000000 +0200
@@ -42,6 +42,10 @@
 %if %suse_version > 1000 && %suse_version <= 1010
 BuildRequires:  gecko-sdk mozilla-xulrunner
 %endif
+# libexpat-devel is explicitely needed since openSUSE-11.1
+%if %suse_version > 1100
+BuildRequires:  libexpat-devel
+%endif
 # poppler is needed to build the PDF import extension
 # the needed version 0.8.0 has been avaiable only since openSUSE-11.0
 %if %suse_version >= 1100
@@ -92,7 +96,7 @@
 License:        LGPL v3 only
 Group:          Productivity/Office/Suite
 Version:        3.0.0.2
-Release:        1
+Release:        2
 # source sripts for architectures
 %ifarch ppc
 %define       ooo_source_script %ooo_build_dir/%ooo_build_tag/LinuxPPCEnv.Set.sh
@@ -186,6 +190,7 @@
 Patch1:         ooo-build-helpcontent-en-us-only.diff
 Patch2:         ooo-build-help-in-usr-share.diff
 Patch3:         ooo-build-3.0.0.2-java-1.4.diff
+Patch4:         ooo-build-3.0.0.2-mono-2.0.diff
 #
 # patches against the upstream sources, must be -p0
 # Patch1000:    bug-123456-fix-foo.diff		# example
@@ -439,6 +444,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 install -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} src/
 install -m 644 %{S:50} %{S:51} %{S:52} %{S:53} %{S:54} %{S:55} %{S:56} %{S:58} %{S:59} %{S:60} %{S:61} %{S:62} %{S:63} %{S:64} %{S:65} %{S:66} src/
 # extra localizations sources
@@ -724,6 +730,9 @@
 ####################################################
 
 %changelog
+* Fri Aug 29 2008 pmladek@suse.cz
+- added libexpat-devel to BuildRequires
+- fixed build with mono 2.0
 * Wed Aug 27 2008 pmladek@suse.cz
 - updated ooo-build to version 3.0.0.2
 * Thu Aug 21 2008 pmladek@suse.cz

OpenOffice_org-l10n-group2.spec: same change
++++++ OpenOffice_org.spec ++++++
--- /var/tmp/diff_new_pack.U32055/_old	2008-08-30 02:24:24.000000000 +0200
+++ /var/tmp/diff_new_pack.U32055/_new	2008-08-30 02:24:24.000000000 +0200
@@ -30,6 +30,10 @@
 %if %suse_version > 1000 && %suse_version <= 1010
 BuildRequires:  gecko-sdk mozilla-xulrunner
 %endif
+# libexpat-devel is explicitely needed since openSUSE-11.1
+%if %suse_version > 1100
+BuildRequires:  libexpat-devel
+%endif
 # poppler is needed to build the PDF import extension
 # the needed version 0.8.0 has been avaiable only since openSUSE-11.0
 %if %suse_version >= 1100
@@ -113,7 +117,7 @@
 License:        Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT
 Group:          Productivity/Office/Suite
 Version:        3.0.0.2
-Release:        1
+Release:        3
 AutoReqProv:    on
 PreReq:         coreutils /usr/bin/update-mime-database
 PreReq:         %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq}
@@ -300,6 +304,7 @@
 Patch1:         ooo-build-helpcontent-en-us-only.diff
 Patch2:         ooo-build-help-in-usr-share.diff
 Patch3:         ooo-build-3.0.0.2-java-1.4.diff
+Patch4:         ooo-build-3.0.0.2-mono-2.0.diff
 #
 # patches against the upstream sources, must be -p0
 # Patch1000:    bug-123456-fix-foo.diff		# example
@@ -775,6 +780,7 @@
 %patch1
 %patch2
 %patch3
+%patch4
 install -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} %{S:15} %{S:16} %{S:17} %{S:18} src/
 install -m 644 %{S:50} %{S:51} %{S:52} %{S:53} %{S:54} %{S:55} %{S:56} %{S:58} %{S:59} %{S:60} %{S:61} %{S:62} %{S:63} %{S:64} %{S:65} %{S:66} src/
 # extra localizations sources
@@ -1254,6 +1260,9 @@
 %{_prefix}/bin/dmake
 
 %changelog
+* Fri Aug 29 2008 pmladek@suse.cz
+- added libexpat-devel to BuildRequires
+- fixed build with mono 2.0
 * Wed Aug 27 2008 pmladek@suse.cz
 - fixed build with java 1.4 target for 10.2 and 10.3
 * Wed Aug 27 2008 pmladek@suse.cz














++++++ ooo-build-3.0.0.2-mono-2.0.diff ++++++
Index: patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff
===================================================================
--- patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff	(revision 13728)
+++ patches/mono/cli_ure-source-bootstrap-managed_bootstrap-cs.diff	(working copy)
@@ -118,7 +118,7 @@
 +
 +    static object ExtractObject(IntPtr managed)
 +    {
-+        GCHandle handle = GCHandle.op_Explicit(managed);
++        GCHandle handle = (GCHandle)managed;
 +        object ret = handle.Target;
 +        handle.Free();
 +        return ret;














++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)