Hello community, here is the log from the commit of package unoconv for openSUSE:Factory checked in at 2011-10-25 17:15:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unoconv (Old) and /work/SRC/openSUSE:Factory/.unoconv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unoconv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/unoconv/unoconv.changes 2011-09-23 12:49:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unoconv.new/unoconv.changes 2011-10-28 15:23:22.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Oct 20 20:46:12 UTC 2011 - a...@mizerski.pl + +- fixed bnc#718115 + +------------------------------------------------------------------- +Thu Oct 20 18:07:55 UTC 2011 - badshah...@gmail.com + +- Added licence header in spec file +- Removed old changelogs from %changelog section in spec file + +------------------------------------------------------------------- +Wed Oct 19 13:42:43 UTC 2011 - vu...@opensuse.org + +- Add unoconv-libreoffice-support.patch: add support for + LibreOffice. +- Add unoconv-output-argument.patch: deprecate --outputpath in + favor of --output, that works in a more reasonable way. Taken + from git. + +------------------------------------------------------------------- New: ---- unoconv-libreoffice-support.patch unoconv-output-argument.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unoconv.spec ++++++ --- /var/tmp/diff_new_pack.lWjIwD/_old 2011-10-28 15:23:48.000000000 +0200 +++ /var/tmp/diff_new_pack.lWjIwD/_new 2011-10-28 15:23:48.000000000 +0200 @@ -15,27 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - -Summary: Tool to convert between any document format supported by OpenOffice - Name: unoconv Version: 0.4 Release: 1 License: GPL -Group: Productivity/File utilities +Summary: Tool to convert between any document format supported by LibreOffice Url: http://dag.wieers.com/home-made/unoconv/ +Group: Productivity/File utilities Source: http://dag.wieers.com/home-made/unoconv/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM unoconv-0.4-LD_LIBRARY_PATH.patch bnc#657140 a...@mizerski.pl -- fix LD_LIBRARY_PATH handling. fixed in svn rev9235, so it should be in v0.5 Patch0: %{name}-0.4-LD_LIBRARY_PATH.patch +# PATCH-FIX-UPSTREAM unoconv-libreoffice-support.patch bnc#725004 vu...@opensuse.org -- Add support for LibreOffice, taken from git +Patch1: unoconv-libreoffice-support.patch +# PATCH-FIX-UPSTREAM unoconv-output-argument.patch bnc#725004 vu...@opensuse.org -- deprecate --outputpath in favor of --output, that works in a more reasonable way, taken from git +Patch2: unoconv-output-argument.patch +Requires: libreoffice-pyuno >= 2.0 +Requires: python >= 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: python >= 2.0 -Requires: OpenOffice_org-pyuno >= 2.0 %description -unoconv converts between any document format that OpenOffice understands. -It uses OpenOffice's UNO bindings for non-interactive conversion of +unoconv converts between any document format that LibreOffice understands. +It uses LibreOffice's UNO bindings for non-interactive conversion of documents. Supported document formats include: Open Document Text (.odt), @@ -49,15 +50,17 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %install -%__make DESTDIR=%{buildroot} install -%__make DESTDIR=%{buildroot} install-links +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install-links %clean -%__rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-, root, root, 0755) ++++++ unoconv-libreoffice-support.patch ++++++ >From 445f4f2b79384d942c0e0cd18231e6f6c81b0528 Mon Sep 17 00:00:00 2001 From: Hans de Graaff <h...@winkwaves.com> Date: Wed, 27 Apr 2011 12:49:31 +0200 Subject: [PATCH] Add support for libreoffice. --- unoconv | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/unoconv b/unoconv index 611b3fe..72a026b 100755 --- a/unoconv +++ b/unoconv @@ -20,7 +20,8 @@ global convertor, oobin, oobinpath, oolibpath, ooproc ### The first thing we ought to do is find a suitable OpenOffice installation ### with a compatible pyuno library that we can import. -extrapaths = glob.glob('/usr/lib*/openoffice*/program') + \ +extrapaths = glob.glob('/usr/lib*/libreoffice*/basis*/program') + \ + glob.glob('/usr/lib*/openoffice*/program') + \ glob.glob('/usr/lib*/openoffice*/basis*/program') + \ glob.glob('/usr/lib*/ooo*/program') + \ glob.glob('/usr/lib*/ooo*/basis*/program') + \ -- 1.7.5.4 ++++++ unoconv-output-argument.patch ++++++ >From 9b3cf1bab1859743d4e59a691aa56d3b3e954fe0 Mon Sep 17 00:00:00 2001 From: Dag Wieers <d...@wieers.com> Date: Mon, 25 Oct 2010 08:46:13 +0000 Subject: [PATCH] Change to how -o/--output/--outputpath works (can now output to filenames too) (patch tweaked to apply) --- a/docs/unoconv.1.txt +++ b/docs/unoconv.1.txt @@ -60,8 +60,11 @@ connections or even for remote connections. -l, --listener:: Start unoconv as listener for unoconv clients to connect to. --o, --outputpath:: - Directory to put converted documents. +-o, --output:: + If the argument is a directory, put the converted documents in this + directory. If multiple input files are provided, use it as a + basename (and add output extension). Otherwise use it as the + output filename. --pipe:: Use a pipe as an alternative connection mechanism to talk to OpenOffice. diff --git a/unoconv b/unoconv index 239c261..2c8f620 100755 --- a/unoconv +++ b/unoconv @@ -333,7 +333,7 @@ class Options: self.format = None self.importfilter = "" self.listener = False - self.outputpath = None + self.output = None self.pipe = None self.port = '2002' self.server = 'localhost' @@ -347,9 +347,9 @@ class Options: try: opts, args = getopt.getopt (args, 'c:d:e:f:hi:Llo:p:s:t:T:v', ['connection=', 'doctype=', 'export', 'format=', 'help', - 'import', 'listener', 'outputpath=', 'pipe=', 'port=', - 'server=', 'timeout=', 'show', 'stdout', 'template', - 'verbose', 'version'] ) + 'import', 'listener', 'output=', 'outputpath', 'pipe=', + 'port=', 'server=', 'timeout=', 'show', 'stdout', + 'template', 'verbose', 'version'] ) except getopt.error, exc: print 'unoconv: %s, try unoconv -h for a list of all the options' % str(exc) sys.exit(255) @@ -382,8 +382,11 @@ class Options: self.importfilter = arg elif opt in ['-l', '--listener']: self.listener = True - elif opt in ['-o', '--outputpath']: - self.outputpath = arg + elif opt in ['-o', '--output']: + self.output = arg + elif opt in ['--outputpath']: + print >>sys.stderr, 'Warning: This option is deprecated by --output.' % arg + self.output = arg elif opt in ['--pipe']: self.pipe = arg elif opt in ['-p', '--port']: @@ -474,7 +477,7 @@ unoconv options: -i, --import=string set import filter option string eg. -i utf8 -l, --listener start a listener to use by unoconv clients - -o, --outputpath=name output directory + -o, --output=name output basename, filename or directory --pipe=name alternative method of connection using a pipe -p, --port=port specify the port (default: 2002) to be used by client or listener @@ -656,10 +659,15 @@ class Convertor: if not op.stdout: (outputfn, ext) = os.path.splitext(inputfn) - if not op.outputpath: + if not op.output: outputfn = outputfn + os.extsep + outputfmt.extension + elif os.path.isdir(op.output): + outputfn = os.path.join(op.output, os.path.basename(outputfn) + os.extsep + outputfmt.extension) + elif len(op.filenames) > 1: + outputfn = op.output + os.extsep + outputfmt.extension else: - outputfn = os.path.join(op.outputpath, os.path.basename(outputfn) + os.extsep + outputfmt.extension) + outputfn = op.output + outputurl = unohelper.absolutize( self.cwd, unohelper.systemPathToFileUrl(outputfn) ) doc.storeToURL(outputurl, tuple(outputprops) ) info(1, "Output file: %s" % outputfn) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
