[unoconv] Resolves: rhbz#1047539 --stdout option does not work
David Tardon
dtardon at fedoraproject.org
Wed Feb 12 10:44:54 UTC 2014
commit 941033dfd6361b62239cc95ed8b8208228255e90
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 12 11:16:16 2014 +0100
Resolves: rhbz#1047539 --stdout option does not work
...o-70309-can-t-write-bytes-direct-to-stdou.patch | 39 ++++++++++++++++++++
unoconv.spec | 7 +++-
2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-70309-can-t-write-bytes-direct-to-stdou.patch b/0001-Resolves-fdo-70309-can-t-write-bytes-direct-to-stdou.patch
new file mode 100644
index 0000000..24dca0d
--- /dev/null
+++ b/0001-Resolves-fdo-70309-can-t-write-bytes-direct-to-stdou.patch
@@ -0,0 +1,39 @@
+From 3249fd3df136f1a859ac0272f75fcbf010926d58 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 7 Nov 2013 13:33:37 +0000
+Subject: [PATCH] Resolves: fdo#70309 can't write bytes direct to stdout in
+ python3
+
+---
+ unoconv | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unoconv2.py b/unoconv2.py
+index a4f9490..2b0b0eb 100755
+--- a/unoconv2.py
++++ b/unoconv2.py
+@@ -1146,7 +1146,7 @@ if __name__ == '__main__':
+ self.closed = 1
+
+ def writeBytes( self, seq ):
+- sys.stdout.write( seq.value )
++ sys.stdout.buffer.write( seq.value )
+
+ def flush( self ):
+ pass
+diff --git a/unoconv3.py b/unoconv3.py
+index a4f9490..2b0b0eb 100755
+--- a/unoconv3.py
++++ b/unoconv3.py
+@@ -1146,7 +1146,7 @@ if __name__ == '__main__':
+ self.closed = 1
+
+ def writeBytes( self, seq ):
+- sys.stdout.write( seq.value )
++ sys.stdout.buffer.write( seq.value )
+
+ def flush( self ):
+ pass
+--
+1.8.5.3
+
diff --git a/unoconv.spec b/unoconv.spec
index 9624e03..8f0544b 100644
--- a/unoconv.spec
+++ b/unoconv.spec
@@ -1,7 +1,7 @@
Summary: Tool to convert between any document format supported by LibreOffice
Name: unoconv
Version: 0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: System Environment/Base
URL: http://dag.wieers.com/home-made/unoconv/
@@ -9,6 +9,7 @@ Source: http://dag.wieers.com/home-made/%{name}/%{name}-%{version}.tar.gz
Patch0: 0001-Fix-a-broken-export-option-and-add-V-as-alternative-.patch
Patch1: 0001-python3-added-compatibility.patch
Patch2: 0001-update-FSF-address.patch
+Patch3: 0001-Resolves-fdo-70309-can-t-write-bytes-direct-to-stdou.patch
BuildArch: noarch
Requires: libreoffice-filters
@@ -28,6 +29,7 @@ RTF, Docbook (.xml), and more.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
@@ -50,6 +52,9 @@ popd
%{_bindir}/%{name}
%changelog
+* Wed Feb 12 2014 David Tardon <dtardon at redhat.com> - 0.6-8
+- Resolves: rhbz#1047539 --stdout option does not work
+
* Thu Jan 30 2014 David Tardon <dtardon at redhat.com> - 0.6-7
- pull in all libreoffice filters
More information about the scm-commits
mailing list