diff --git a/0001-Fix-typo-and-clean-up.patch b/0001-Fix-typo-and-clean-up.patch new file mode 100644 index 0000000..88a16e2 --- /dev/null +++ b/0001-Fix-typo-and-clean-up.patch @@ -0,0 +1,52 @@ +From 75d215d47331f816c5d41a34b63badf6e1636ac8 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Fri, 16 Dec 2011 09:53:31 +0100 +Subject: [PATCH] Fix typo and clean up. + +--- + scp2/source/ooo/module_hidden_ooo.scp | 1 - + scp2/source/python/module_python.scp | 2 +- + scp2/source/python/module_python_mailmerge.scp | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp +index da5775b..024ec68 100644 +--- a/scp2/source/ooo/module_hidden_ooo.scp ++++ b/scp2/source/ooo/module_hidden_ooo.scp +@@ -616,7 +616,6 @@ Module gid_Module_Root_Files_6 + gid_File_Share_Registry_Main_Xcd, + gid_File_Share_Registry_Forcedefault_Xcd, + gid_File_Pymailmerge, +- gid_File_Pymailmerge_msgbox, + gid_File_Xsl_Common_Measure_Conversion, + gid_File_Xsl_Common_Math_Functions, + gid_File_Xsl_Export_Common_Body, +diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp +index 32f0dc8..6ee8345 100644 +--- a/scp2/source/python/module_python.scp ++++ b/scp2/source/python/module_python.scp +@@ -41,7 +41,7 @@ Module gid_Module_Optional_Pyuno + gid_Dir_PythonFramework_Versions_ver_lib, + gid_Dir_PythonFramework_Versions_ver_lib_pythonver, + gid_Dir_PythonFramework_Versions_ver_lib_pythonver_config); +- Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); ++ Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd); + Unixlinks = (gid_Unixlink_Python_Headers, + gid_Unixlink_Python_Resources, + gid_Unixlink_Python_Versions_Current, +diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp +index 3027e85..cf5ad7e 100644 +--- a/scp2/source/python/module_python_mailmerge.scp ++++ b/scp2/source/python/module_python_mailmerge.scp +@@ -32,7 +32,7 @@ + File gid_File_Pymailmerge + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Program; +- name = "mailmerge.zip"; ++ Name = "mailmerge.zip"; + Styles = (ARCHIVE); + End + #endif +-- +1.7.7.3 + diff --git a/libreoffice.spec b/libreoffice.spec index c80d249..69c725f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -114,6 +114,7 @@ Patch12: libreoffice-rhel6poppler.patch Patch13: 0001-force-gbuild-stage-for-CustomTargets.patch Patch14: 0001-these-translations-do-already-exist-in-translations-.patch Patch15: 0001-fix-syntactic-error.patch +Patch16: 0001-Fix-typo-and-clean-up.patch # TODO: this in S390 only, so it can wait .-) #Patch13: solenv.fix.mk.inheritance.patch @@ -761,6 +762,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch13 -p1 -b .force-gbuild-stage-for-CustomTargets.patch %patch14 -p1 -b .these-translations-do-already-exist-in-translations-.patch %patch15 -p1 -b .fix-syntactic-error.patch +%patch16 -p1 -b .Fix-typo-and-clean-up.patch #%patch13 -p1 -b .solenv.fix.mk.inheritance.patch %build