Hello community, here is the log from the commit of package unoconv for openSUSE:Factory checked in at 2014-11-05 16:26:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unoconv (Old) and /work/SRC/openSUSE:Factory/.unoconv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unoconv" Changes: -------- --- /work/SRC/openSUSE:Factory/unoconv/unoconv.changes 2012-11-05 15:03:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unoconv.new/unoconv.changes 2014-11-05 16:26:35.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Oct 23 08:49:05 UTC 2014 - [email protected] + +- made python3 patch be applied for openSUSE >= 13.2 +- removed odt2txt symlink to resolve conflict with odt2txt package + +------------------------------------------------------------------- +Sat Oct 4 19:35:11 UTC 2014 - [email protected] + +- Add unoconv-python3.patch: port to python 3. The main integration + is with libreoffice, which also used python3 by now (boo#899736). + Patch copied from Fedora. + +------------------------------------------------------------------- New: ---- unoconv-python3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unoconv.spec ++++++ --- /var/tmp/diff_new_pack.547CqP/_old 2014-11-05 16:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.547CqP/_new 2014-11-05 16:26:35.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package unoconv # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,8 +24,12 @@ Group: Productivity/File utilities Url: http://dag.wieers.com/home-made/unoconv/ Source: http://dag.wieers.com/home-made/unoconv/unoconv-%{version}.tar.gz -Requires: libreoffice-pyuno >= 2.0 -Requires: python >= 2.0 +%if 0%{?suse_version} >= 1320 +# PATCH-FIX-UPSTREAM unoconv-python3.patch [email protected] -- Port to python3, patch from Fedora +Patch0: unoconv-python3.patch +Requires: python >= 3.0 +%endif +Requires: libreoffice-pyuno BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -44,12 +48,16 @@ %prep %setup -q +%if 0%{?suse_version} >= 1320 +%patch0 -p1 +%endif %build %install make DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} install-links +rm -v %{buildroot}%{_bindir}/odt2txt %files %defattr(-, root, root, 0755) ++++++ unoconv-python3.patch ++++++ ++++ 630 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
