pool/libreoffice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 241933 from home:arnaudversini:branches:LibreOffice:Factory

Browse Source 
Use python 3 instead of python 2.

OBS-URL: https://build.opensuse.org/request/show/241933
OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=174
This commit is contained in:
Fridrich Strba 2014-07-22 21:48:37 +00:00 committed by Git OBS Bridge
parent 70508f1028
commit 443f0aa28e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libreoffice.changes
View File

@ -10,6 +10,11 @@ Mon Jul 21 06:58:44 UTC 2014 - tchvatal@suse.com
- Version bump to 4.3.0.3: - Version bump to 4.3.0.3:
* Various small bugfixes. * Various small bugfixes.
-------------------------------------------------------------------
Sun Jul 20 15:29:03 UTC 2014 - arnaud.versini@gmail.com
- Use Python3 instead of Python 2 for pyuno.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 11 08:26:26 UTC 2014 - tchvatal@suse.com Fri Jul 11 08:26:26 UTC 2014 - tchvatal@suse.com

14
libreoffice.spec
View File

@ -190,9 +190,9 @@ BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib BuildRequires: perl-Compress-Zlib
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: procps BuildRequires: procps
BuildRequires: python-devel BuildRequires: python3-devel
BuildRequires: python-lxml BuildRequires: python3-lxml
BuildRequires: python-xml BuildRequires: python3-xml
BuildRequires: recode BuildRequires: recode
BuildRequires: rhino BuildRequires: rhino
BuildRequires: sac BuildRequires: sac
@ -910,11 +910,11 @@ CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS
# Whack in our python2 so we don't have to use internal one # Whack in our python3 so we don't have to use internal one
# which is quite nightmare. # which is quite nightmare.
export PYTHON=%{_bindir}/python2 export PYTHON=%{_bindir}/python3
export PYTHON_CFLAGS=`pkg-config --cflags python2` export PYTHON_CFLAGS=`pkg-config --cflags python3`
export PYTHON_LIBS=`pkg-config --libs python2` export PYTHON_LIBS=`pkg-config --libs python3`
# do not run configure in autogen but use macro later # do not run configure in autogen but use macro later
export NOCONFIGURE=yes export NOCONFIGURE=yes