- fix build with bison 2.5

Changed files:
    libreoffice-3.3.2-bison25.diff -> 1.1
    libreoffice.spec -> 1.895

diff --git a/libreoffice-3.3.2-bison25.diff b/libreoffice-3.3.2-bison25.diff
new file mode 100644 (file)
index 0000000..869b6c8
--- /dev/null
+++ b/libreoffice-3.3.2-bison25.diff
@@ -0,0 +1,23 @@
+--- connectivity/source/parse/sqlbison.y       2011-05-20 13:21:02.000000000 -0600
++++ connectivity/source/parse/sqlbison.y       2011-05-20 13:22:11.000000000 -0600
+@@ -4338,7 +4338,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+       if(!m_sErrorMessage.getLength())
+       {
+--- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600
++++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600
+@@ -233,7 +233,7 @@
+         // returns the type for a parameter in a given function name
+         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
+ 
+-        void error(sal_Char *fmt);
++        void error(const sal_Char *fmt);
+         int SQLlex();
+ #ifdef YYBISON
+         void setParseTree(OSQLParseNode * pNewParseTree);
+

diff --git a/libreoffice.spec b/libreoffice.spec
index 0d8accb5a7b20ee08bdf6c83694ae43c5cc131e5..e8027c696ae1343703c4473735949f3c0e5e8f71 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -155,6 +155,7 @@ Patch0:             %{name}-build-apply.patch
 Patch100:      %{name}-hotfix-with-lang-all.patch
 Patch101:      %{name}-hotfix-kde4.patch
 Patch102:      %{name}-impress-dont-exit-after-pps-autoplay.patch
+Patch103:      %{name}-3.3.2-bison25.diff
 URL:           http://www.documentfoundation.org/
 BuildRequires: /usr/bin/getopt
 BuildRequires: GConf2-devel
@@ -374,8 +375,8 @@ Requires:   %{name}-ure = %{version}-%{release}
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:      cups-lib
 Requires:      fonts-TTF-OpenSymbol
-%{?with_system_hsqldb:Requires:        java-hsqldb}
 %{?with_system_beanshell:Requires:     java-beanshell}
+%{?with_system_hsqldb:Requires:        java-hsqldb}
 Requires:      libstdc++ >= 5:3.2.1
 Requires:      mktemp
 Requires:      saxon
@@ -416,8 +417,8 @@ Obsoletes:  openoffice.org-i18n-by
 Obsoletes:     openoffice.org-i18n-fo
 Obsoletes:     openoffice.org-i18n-fo-gtk
 Obsoletes:     openoffice.org-i18n-fo-kde
-Obsoletes:     openoffice.org-i18n-gu_IN
 Obsoletes:     openoffice.org-i18n-gd
+Obsoletes:     openoffice.org-i18n-gu_IN
 Obsoletes:     openoffice.org-i18n-ia
 Obsoletes:     openoffice.org-i18n-ia-gtk
 Obsoletes:     openoffice.org-i18n-ia-kde
@@ -441,8 +442,8 @@ Obsoletes:  openoffice.org-i18n-ro
 Obsoletes:     openoffice.org-i18n-ro-gtk
 Obsoletes:     openoffice.org-i18n-ro-kde
 Obsoletes:     openoffice.org-i18n-sc
-Obsoletes:     openoffice.org-i18n-sx
 Obsoletes:     openoffice.org-i18n-sw
+Obsoletes:     openoffice.org-i18n-sx
 Obsoletes:     openoffice.org-i18n-ti
 Obsoletes:     openoffice.org-i18n-ur
 Obsoletes:     openoffice.org-libs < 1:2.1.0-0.m6.0.11
@@ -459,8 +460,8 @@ Summary(pl.UTF-8):  Wiązania Pythona dla LibreOffice
 Group:         Libraries
 Requires:      %{name}-core = %{version}-%{release}
 Requires:      python
-Obsoletes:     openoffice.org-pyuno
 Provides:      pyuno
+Obsoletes:     openoffice.org-pyuno
 
 %description pyuno
 Cool Python bindings for the LibreOffice UNO component model. Allows
@@ -2489,6 +2490,7 @@ ln -sf %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 ln -s %{PATCH100} patches/hotfixes/%{basename:%{PATCH100}}.diff
 ln -s %{PATCH101} patches/hotfixes/%{basename:%{PATCH101}}.diff
 ln -s %{PATCH102} patches/hotfixes/%{basename:%{PATCH102}}.diff
+ln -s %{PATCH103} patches/hotfixes/%{basename:%{PATCH103}}.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.