diff --git a/.gitignore b/.gitignore index fdb7625..a1bdbc0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,3 @@ unoconv-0.3.tar.bz2 /unoconv-0.5.tar.bz2 /unoconv-0.6.tar.gz /unoconv-0.7.tar.gz -/0.8.2.tar.gz -/0.9.tar.gz -/0.9.0.tar.gz diff --git a/0001-Updated-ChangeLog.patch b/0001-Updated-ChangeLog.patch new file mode 100644 index 0000000..66c477b --- /dev/null +++ b/0001-Updated-ChangeLog.patch @@ -0,0 +1,40 @@ +From b02c77cc669715858a2e6a658cb1988e5e89cf3b Mon Sep 17 00:00:00 2001 +From: Dag Wieers +Date: Thu, 9 Jul 2015 01:47:52 +0200 +Subject: [PATCH] Updated ChangeLog + +--- + ChangeLog | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 0c21fb4..7ca8755 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,22 @@ + * 0.7 - released 2015-07-09 +-- ++- Ported to Python 3 (Riccardo Magliocchetti) ++- Update Indexes (eg. TOC) during conversion (Peter Demin) ++- Added XLSX support (Josias Montag) ++- Fix output to non-existing directory ++- Ensure that LibreOfficeDev release are using new long options (Chia-liang Kao) ++- Set output format based on output filename extension (Patrick McAndrew) ++- Accept 'office' as binary on MacOSX (Andreas Jung) ++- Added Microsoft WPS import filter (Josias Montag) ++- Fix --stdout output on Python 3 (Caolán McNamara) ++- Added -F/--field option to update user fields during conversion (Raphaël Pinson) ++- Added OpenOffice search path on MacOSX (Vittal Aithal) ++- Cycle through all images references before conversion ++- Added --preserve option to preserve timestamp and permissions (Vincent Bernat) ++- Added --stdin option to read from standard input ++- Accept remote URLs as input filename ++- Fix exit code 81 and recover from initial failure (Daniel Vandersluis) ++- Improve documentation related to error codes and using unoconv with Nginx/Apache/PHP ++ + + * 0.6 - released 2012-09-10 + - Implement debugging output (-vvv) +-- +2.1.0 + diff --git a/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch b/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch index 051e355..70c24f4 100644 --- a/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch +++ b/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch @@ -17,8 +17,8 @@ index 2e56d3c..1158374 100755 fmts.add('document', 'vor3', 'vor', 'StarWriter 3.0 Template', 'StarWriter 3.0 Vorlage/Template') ### 4 -fmts.add('document', 'wps', 'wps', 'Microsoft Works', 'MS_Works') fmts.add('document', 'xhtml', 'html', 'XHTML Document', 'XHTML Writer File') ### 33 - fmts.add('document', 'epub', 'epub', 'Electronic Publication', 'EPUB') + ### WebDocument -- 2.1.0 diff --git a/0001-update-FSF-address.patch b/0001-update-FSF-address.patch index b1c357b..925cf4f 100644 --- a/0001-update-FSF-address.patch +++ b/0001-update-FSF-address.patch @@ -141,7 +141,7 @@ index 30e6706..e4a1ac8 100755 +### MA 02110-1301 USA. ### Copyright 2007-2010 Dag Wieers - from __future__ import print_function + from distutils.version import LooseVersion -- 1.7.11.7 diff --git a/0002-remove-export-formats-dropped-by-LibreOffice.patch b/0002-remove-export-formats-dropped-by-LibreOffice.patch index 22fc6a6..f46a52b 100644 --- a/0002-remove-export-formats-dropped-by-LibreOffice.patch +++ b/0002-remove-export-formats-dropped-by-LibreOffice.patch @@ -31,8 +31,8 @@ index dd73799..a5d29da 100755 -fmts.add('document', 'vor4', 'vor', 'StarWriter 4.0 Template', 'StarWriter 4.0 Vorlage/Template') ### 5 -fmts.add('document', 'vor3', 'vor', 'StarWriter 3.0 Template', 'StarWriter 3.0 Vorlage/Template') ### 4 fmts.add('document', 'xhtml', 'html', 'XHTML Document', 'XHTML Writer File') ### 33 - fmts.add('document', 'epub', 'epub', 'Electronic Publication', 'EPUB') + ### WebDocument @@ -382,14 +374,9 @@ fmts.add('web', 'html', 'html', 'HTML Document', 'HTML') ### 2 fmts.add('web', 'html', 'html', 'HTML Document Template', 'writerweb8_writer_template') ### 13 fmts.add('web', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki_Web') ### 9 diff --git a/changelog b/changelog deleted file mode 100644 index 31d4940..0000000 --- a/changelog +++ /dev/null @@ -1,145 +0,0 @@ -* Mon Nov 21 2022 David Tardon - 0.9.0-9 -- Convert license to SPDX - -* Sat Jul 23 2022 Fedora Release Engineering - 0.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.9.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.9.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.9.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Dec 22 2019 David Tardon - 0.9.0-2 -- upload fixed tarball - -* Sat Sep 28 2019 David Tardon - 0.9-1 -- new upstream release - -* Sat Aug 31 2019 David Tardon - 0.8.2-1 -- new upstream release - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 0.7-4 -- Rebuild for Python 3.6 - -* Fri Feb 05 2016 Fedora Release Engineering - 0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 05 2016 David Tardon - 0.7-2 -- don't install obscure filter deps by default - -* Fri Jul 10 2015 David Tardon - 0.7-1 -- new upstream release - -* Fri Jun 19 2015 Fedora Release Engineering - 0.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Apr 19 2014 David Tardon - 0.6-10 -- Resolves: rhbz#1076275 unoconv trips over '-f latex' -- do not show unusable export formats - -* Thu Apr 17 2014 David Tardon - 0.6-9 -- Resolves: rhbz#1076275 unonconv trips over '-f latex' - -* Wed Feb 12 2014 David Tardon - 0.6-8 -- Resolves: rhbz#1047539 --stdout option does not work - -* Thu Jan 30 2014 David Tardon - 0.6-7 -- pull in all libreoffice filters - -* Sun Aug 04 2013 Fedora Release Engineering - 0.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jul 23 2013 David Tardon - 0.6-5 -- Resolves: rhbz#987046 drop env from shebang - -* Wed May 29 2013 David Tardon - 0.6-4 -- rhbz#957776 cannot open office documents - -* Mon Apr 08 2013 David Tardon - 0.6-3 -- Resolves: rhbz#947096 unoconv doesn't work with Libreoffice 4.0 - -* Fri Feb 15 2013 Fedora Release Engineering - 0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Nov 05 2012 David Tardon - 0.6-1 -- new upstream release - -* Sun Jul 22 2012 Fedora Release Engineering - 0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Mar 26 2012 David Tardon - 0.5-1 -- new upstream release - -* Mon Mar 26 2012 David Tardon - 0.4-6 - -* Sat Jan 14 2012 Fedora Release Engineering - 0.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 30 2010 Orcan Ogetbil - 0.4-3 -- Add missing Requires on openoffice.org-brand/libreoffice-core. RHBZ#658576 - -* Sat Nov 13 2010 Orcan Ogetbil - 0.4-2 -- Backport some upstream fixes (LD_LIBRARY_PATH issue and -o flag issue) - -* Fri Nov 12 2010 Orcan Ogetbil - 0.4-1 -- Update to 0.4 - -* Sat Oct 30 2010 Caolán McNamara - 0.3-5 -- rebuild for LibreOffice - -* Sun Jul 26 2009 Fedora Release Engineering - 0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu May 07 2009 Orcan Ogetbil - 0.3-3 -- Fix rpmlints -- Prepare package for Fedora review - -* Sun Feb 22 2009 Peter Hanecak 0.3-2 -- used %%{?dist} in release number -- license GPLv2 - -* Wed Dec 19 2007 Dag Wieers - 0.3-2 - 5993+/dag -- Fixed openoffice.org2 dependency on RHEL4. - -* Sat Sep 01 2007 Dag Wieers - 0.3-1 -- Updated to release 0.3. - -* Sun May 20 2007 Dag Wieers - 0.2-1 -- Updated to release 0.2. - -* Sat May 19 2007 Dag Wieers - 0.1-1 -- Initial package. (using DAR) diff --git a/sources b/sources index c565d13..1971310 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.9.0.tar.gz) = 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469 +eff96b17a62876abfef09c16d0516d09 unoconv-0.7.tar.gz diff --git a/unoconv.spec b/unoconv.spec index 5dbf050..baf0aec 100644 --- a/unoconv.spec +++ b/unoconv.spec @@ -1,37 +1,37 @@ -Summary: A tool to convert documents from/to any format supported by LibreOffice +Summary: Tool to convert between any document format supported by LibreOffice Name: unoconv -Version: 0.9.0 -Release: %autorelease -License: GPL-2.0-only -URL: https://github.com/unoconv/unoconv/ -Source: https://github.com/unoconv/unoconv/archive/%{version}.tar.gz +Version: 0.7 +Release: 1%{?dist} +License: GPLv2 +Group: System Environment/Base +URL: http://dag.wieers.com/home-made/unoconv/ +Source: http://dag.wieers.com/home-made/%{name}/%{name}-%{version}.tar.gz Patch0: 0001-python3-added-compatibility.patch Patch1: 0001-update-FSF-address.patch Patch2: 0001-make-LaTeX-export-usable-with-writer2latex-ext.patch Patch3: 0001-libreoffice-or-OO.o-has-never-had-wps-export.patch Patch4: 0002-remove-export-formats-dropped-by-LibreOffice.patch +Patch5: 0001-Updated-ChangeLog.patch BuildArch: noarch -BuildRequires: make BuildRequires: asciidoc BuildRequires: xmlto Requires: libreoffice-filters Requires: libreoffice-pyuno -Suggests: libreoffice-writer2latex -Suggests: openoffice.org-diafilter +Requires: libreoffice-writer2latex +Requires: openoffice.org-diafilter %description -Universal Office Converter (unoconv) is a command line tool to convert any -document format that LibreOffice can import to any document format that -LibreOffice can export. It makes use of the LibreOffice's UNO bindings for -non-interactive conversion of documents. +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 Format (.odg, .odp, .ods, -.odt), MS Word (.doc), MS Office Open/MS OOXML (.docx, .pptx, .xlsx), PDF, -HTML, RTF, and many more. +Supported document formats include Open Document Format (.odf), MS Word (.doc), +MS Office Open/MS OOXML (.xml), Portable Document Format (.pdf), HTML, XHTML, +RTF, Docbook (.xml), and more. %prep %autosetup -p1 @@ -42,14 +42,100 @@ make %{?_smp_mflags} asciidoc README.adoc %install -make install DESTDIR="%{buildroot}" prefix=%{_prefix} +make install DESTDIR="%{buildroot}" %files -%doc AUTHORS ChangeLog README.html +%doc AUTHORS ChangeLog COPYING README.html %doc doc/errcode.html doc/filters.html doc/formats.html doc/selinux.html -%license COPYING %{_mandir}/man1/%{name}.1* %{_bindir}/%{name} %changelog -%autochangelog +* Fri Jul 10 2015 David Tardon - 0.7-1 +- new upstream release + +* Fri Jun 19 2015 Fedora Release Engineering - 0.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Apr 19 2014 David Tardon - 0.6-10 +- Resolves: rhbz#1076275 unoconv trips over '-f latex' +- do not show unusable export formats + +* Thu Apr 17 2014 David Tardon - 0.6-9 +- Resolves: rhbz#1076275 unonconv trips over '-f latex' + +* Wed Feb 12 2014 David Tardon - 0.6-8 +- Resolves: rhbz#1047539 --stdout option does not work + +* Thu Jan 30 2014 David Tardon - 0.6-7 +- pull in all libreoffice filters + +* Sun Aug 04 2013 Fedora Release Engineering - 0.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 David Tardon - 0.6-5 +- Resolves: rhbz#987046 drop env from shebang + +* Wed May 29 2013 David Tardon - 0.6-4 +- rhbz#957776 cannot open office documents + +* Mon Apr 08 2013 David Tardon - 0.6-3 +- Resolves: rhbz#947096 unoconv doesn't work with Libreoffice 4.0 + +* Fri Feb 15 2013 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Nov 05 2012 David Tardon - 0.6-1 +- new upstream release + +* Sun Jul 22 2012 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Mar 26 2012 David Tardon - 0.5-1 +- new upstream release + +* Mon Mar 26 2012 David Tardon - 0.4-6 + +* Sat Jan 14 2012 Fedora Release Engineering - 0.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 30 2010 Orcan Ogetbil - 0.4-3 +- Add missing Requires on openoffice.org-brand/libreoffice-core. RHBZ#658576 + +* Sat Nov 13 2010 Orcan Ogetbil - 0.4-2 +- Backport some upstream fixes (LD_LIBRARY_PATH issue and -o flag issue) + +* Fri Nov 12 2010 Orcan Ogetbil - 0.4-1 +- Update to 0.4 + +* Sat Oct 30 2010 Caolán McNamara - 0.3-5 +- rebuild for LibreOffice + +* Sun Jul 26 2009 Fedora Release Engineering - 0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 07 2009 Orcan Ogetbil - 0.3-3 +- Fix rpmlints +- Prepare package for Fedora review + +* Sun Feb 22 2009 Peter Hanecak 0.3-2 +- used %%{?dist} in release number +- license GPLv2 + +* Wed Dec 19 2007 Dag Wieers - 0.3-2 - 5993+/dag +- Fixed openoffice.org2 dependency on RHEL4. + +* Sat Sep 01 2007 Dag Wieers - 0.3-1 +- Updated to release 0.3. + +* Sun May 20 2007 Dag Wieers - 0.2-1 +- Updated to release 0.2. + +* Sat May 19 2007 Dag Wieers - 0.1-1 +- Initial package. (using DAR)