[libreoffice/f21] move officehelper.py to pyuno package so it can be imported from python

Michael Stahl mstahl at fedoraproject.org
Fri Dec 5 13:17:51 UTC 2014


commit 3bc918079a4139bd4396beb48a3e4d87f58f3196
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Dec 5 14:17:56 2014 +0100

    move officehelper.py to pyuno package so it can be imported from python

 libreoffice.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 50d4234..c2ff161 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        10%{?libo_prerelease}%{?dist}
+Release:        11%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -1467,6 +1467,7 @@ echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{baseinstdir}/program/f
 cat %{buildroot}%{baseinstdir}/program/uno.py >> uno.py
 rm -f %{buildroot}%{baseinstdir}/program/uno.py*
 mv -f %{buildroot}%{baseinstdir}/program/unohelper.py* .
+mv -f %{buildroot}%{baseinstdir}/program/officehelper.py* .
 popd
 
 # rhbz#477435 package opensymbol separately
@@ -2191,7 +2192,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %files emailmerge
 %{baseinstdir}/program/mailmerge.py*
 %{baseinstdir}/program/msgbox.py*
-%{baseinstdir}/program/officehelper.py*
 
 %files writer
 %{baseinstdir}/help/en-US/swriter.*
@@ -2314,9 +2314,11 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %exclude %{baseinstdir}/share/Scripts/python/LibreLogo
 %{libo_python_sitearch}/uno.py*
 %{libo_python_sitearch}/unohelper.py*
+%{libo_python_sitearch}/program/officehelper.py*
 %if 0%{libo_python3}
 %{libo_python_sitearch}/__pycache__/uno.cpython-*
 %{libo_python_sitearch}/__pycache__/unohelper.cpython-*
+%{libo_python_sitearch}/__pycache__/officehelper.cpython-*
 %endif
 %{baseinstdir}/share/registry/pyuno.xcd
 
@@ -2337,6 +2339,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Dec 03 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-11-UNBUILT
+- move officehelper.py to pyuno package so it can be imported from python
+
 * Wed Dec 03 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-10
 - Related: fdo#78151 only make outline title and subtitle readonly in
   master view


More information about the scm-commits mailing list