diff --git a/.gitignore b/.gitignore index fdb7625..803be2e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1 @@ unoconv-0.3.tar.bz2 -/unoconv-0.4.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-libreoffice-or-OO.o-has-never-had-wps-export.patch b/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch deleted file mode 100644 index 051e355..0000000 --- a/0001-libreoffice-or-OO.o-has-never-had-wps-export.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aa46d3cbcec14ae46a176165852089558c524ff2 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Fri, 10 Jul 2015 12:55:13 +0200 -Subject: [PATCH] libreoffice (or OO.o) has never had wps export - ---- - unoconv | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/unoconv b/unoconv -index 2e56d3c..1158374 100755 ---- a/unoconv -+++ b/unoconv -@@ -377,7 +377,6 @@ fmts.add('document', 'uot', 'uot', 'Unified Office Format text','UOF text') ### - fmts.add('document', 'vor', 'vor', 'StarWriter 5.0 Template', 'StarWriter 5.0 Vorlage/Template') ### 6 - 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', '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') - --- -2.1.0 - diff --git a/0001-make-LaTeX-export-usable-with-writer2latex-ext.patch b/0001-make-LaTeX-export-usable-with-writer2latex-ext.patch deleted file mode 100644 index 07e9947..0000000 --- a/0001-make-LaTeX-export-usable-with-writer2latex-ext.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b17d0160d9bd940e40c906684646ad7e4024c24 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 19 Apr 2014 11:18:41 +0200 -Subject: [PATCH 1/2] make LaTeX export usable with writer2latex ext. - ---- - unoconv | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/unoconv b/unoconv -index 30e6706..dd73799 100755 ---- a/unoconv -+++ b/unoconv -@@ -344,7 +344,7 @@ class FmtList: - fmts = FmtList() - - ### TextDocument --fmts.add('document', 'bib', 'bib', 'BibTeX', 'BibTeX_Writer') ### 22 -+fmts.add('document', 'bib', 'bib', 'BibTeX', 'org.openoffice.da.writer2bibtex') ### 22 - fmts.add('document', 'doc', 'doc', 'Microsoft Word 97/2000/XP', 'MS Word 97') ### 29 - fmts.add('document', 'doc6', 'doc', 'Microsoft Word 6.0', 'MS WinWord 6.0') ### 24 - fmts.add('document', 'doc95', 'doc', 'Microsoft Word 95', 'MS Word 95') ### 28 -@@ -353,7 +353,7 @@ fmts.add('document', 'docx', 'docx', 'Microsoft Office Open XML', 'Office Open X - fmts.add('document', 'docx7', 'docx', 'Microsoft Office Open XML', 'MS Word 2007 XML') - fmts.add('document', 'fodt', 'fodt', 'OpenDocument Text (Flat XML)', 'OpenDocument Text Flat XML') - fmts.add('document', 'html', 'html', 'HTML Document (OpenOffice.org Writer)', 'HTML (StarWriter)') ### 3 --fmts.add('document', 'latex', 'ltx', 'LaTeX 2e', 'LaTeX_Writer') ### 31 -+fmts.add('document', 'latex', 'ltx', 'LaTeX 2e', 'org.openoffice.da.writer2latex') ### 31 - fmts.add('document', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki') - fmts.add('document', 'odt', 'odt', 'ODF Text Document', 'writer8') ### 10 - fmts.add('document', 'ooxml', 'xml', 'Microsoft Office Open XML', 'MS Word 2003 XML') ### 11 --- -1.9.0 - diff --git a/0001-python3-added-compatibility.patch b/0001-python3-added-compatibility.patch deleted file mode 100644 index 84ed36b..0000000 --- a/0001-python3-added-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 21b9a845ac7e8805b41d7dab1a6fbf8076689ae8 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Sat, 19 Apr 2014 12:06:27 +0200 -Subject: [PATCH] 0001-python3-added-compatibility.3.patch - ---- - unoconv | 248 ++++++++++++++++++++++++++++++++++++---------------------------- - 1 file changed, 139 insertions(+), 109 deletions(-) - -diff --git a/unoconv b/unoconv -index 30e6706..a13db44 100755 ---- a/unoconv -+++ b/unoconv -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - ### This program is free software; you can redistribute it and/or modify - ### it under the terms of the GNU General Public License as published by --- -1.9.0 - diff --git a/0001-update-FSF-address.patch b/0001-update-FSF-address.patch deleted file mode 100644 index b1c357b..0000000 --- a/0001-update-FSF-address.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 4be0b90f1935120e4f9196b6fc126248079cbf11 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 5 Nov 2012 15:08:24 +0100 -Subject: [PATCH] update FSF address - ---- - COPYING | 41 ++++++++++++++++++++--------------------- - unoconv | 3 ++- - 2 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/COPYING b/COPYING -index d60c31a..d159169 100644 ---- a/COPYING -+++ b/COPYING -@@ -1,12 +1,12 @@ -- GNU GENERAL PUBLIC LICENSE -- Version 2, June 1991 -+ GNU GENERAL PUBLIC LICENSE -+ Version 2, June 1991 - -- Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -- Preamble -+ Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This - General Public License applies to most of the Free Software - Foundation's software and to any other program whose authors commit to - using it. (Some other Free Software Foundation software is covered by --the GNU Library General Public License instead.) You can apply it to -+the GNU Lesser General Public License instead.) You can apply it to - your programs, too. - - When we speak of free software, we are referring to freedom, not -@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. -- -- GNU GENERAL PUBLIC LICENSE -+ -+ GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) -- -+ - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, - and can be reasonably considered independent and separate works in -@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent - access to copy the source code from the same place counts as - distribution of the source code, even though third parties are not - compelled to copy the source along with the object code. -- -+ - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt - otherwise to copy, modify, sublicense or distribute the Program is -@@ -225,7 +225,7 @@ impose that choice. - - This section is intended to make thoroughly clear what is believed to - be a consequence of the rest of this License. -- -+ - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License -@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals - of preserving the free status of all derivatives of our free software and - of promoting the sharing and reuse of software generally. - -- NO WARRANTY -+ NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY - FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER - PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - -- END OF TERMS AND CONDITIONS -- -- How to Apply These Terms to Your New Programs -+ END OF TERMS AND CONDITIONS -+ -+ How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it -@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found. - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- -+ You should have received a copy of the GNU General Public License along -+ with this program; if not, write to the Free Software Foundation, Inc., -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) year name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: - This General Public License does not permit incorporating your program into - proprietary programs. If your program is a subroutine library, you may - consider it more useful to permit linking proprietary applications with the --library. If this is what you want to do, use the GNU Library General -+library. If this is what you want to do, use the GNU Lesser General - Public License instead of this License. -diff --git a/unoconv b/unoconv -index 30e6706..e4a1ac8 100755 ---- a/unoconv -+++ b/unoconv -@@ -11,7 +11,8 @@ - ### - ### You should have received a copy of the GNU General Public License - ### along with this program; if not, write to the Free Software --### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+### Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -+### MA 02110-1301 USA. - ### Copyright 2007-2010 Dag Wieers - - from __future__ import print_function --- -1.7.11.7 - diff --git a/0002-remove-export-formats-dropped-by-LibreOffice.patch b/0002-remove-export-formats-dropped-by-LibreOffice.patch deleted file mode 100644 index 22fc6a6..0000000 --- a/0002-remove-export-formats-dropped-by-LibreOffice.patch +++ /dev/null @@ -1,105 +0,0 @@ -From da17429f0deed3999ffeb98fc0f3688c6e413765 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sat, 19 Apr 2014 11:26:26 +0200 -Subject: [PATCH 2/2] remove export formats dropped by LibreOffice - ---- - unoconv | 32 -------------------------------- - 1 file changed, 32 deletions(-) - -diff --git a/unoconv b/unoconv -index dd73799..a5d29da 100755 ---- a/unoconv -+++ b/unoconv -@@ -358,21 +358,13 @@ fmts.add('document', 'mediawiki', 'txt', 'MediaWiki', 'MediaWiki') - fmts.add('document', 'odt', 'odt', 'ODF Text Document', 'writer8') ### 10 - fmts.add('document', 'ooxml', 'xml', 'Microsoft Office Open XML', 'MS Word 2003 XML') ### 11 - fmts.add('document', 'ott', 'ott', 'Open Document Text', 'writer8_template') ### 21 --fmts.add('document', 'pdb', 'pdb', 'AportisDoc (Palm)', 'AportisDoc Palm DB') - fmts.add('document', 'pdf', 'pdf', 'Portable Document Format', 'writer_pdf_Export') ### 18 --fmts.add('document', 'psw', 'psw', 'Pocket Word', 'PocketWord File') - fmts.add('document', 'rtf', 'rtf', 'Rich Text Format', 'Rich Text Format') ### 16 --fmts.add('document', 'sdw', 'sdw', 'StarWriter 5.0', 'StarWriter 5.0') ### 23 --fmts.add('document', 'sdw4', 'sdw', 'StarWriter 4.0', 'StarWriter 4.0') ### 2 --fmts.add('document', 'sdw3', 'sdw', 'StarWriter 3.0', 'StarWriter 3.0') ### 20 - fmts.add('document', 'stw', 'stw', 'Open Office.org 1.0 Text Document Template', 'writer_StarOffice_XML_Writer_Template') ### 9 - fmts.add('document', 'sxw', 'sxw', 'Open Office.org 1.0 Text Document', 'StarOffice XML (Writer)') ### 1 - fmts.add('document', 'text', 'txt', 'Text Encoded', 'Text (encoded)') ### 26 - fmts.add('document', 'txt', 'txt', 'Text', 'Text') ### 34 - fmts.add('document', 'uot', 'uot', 'Unified Office Format text','UOF text') ### 27 --fmts.add('document', 'vor', 'vor', 'StarWriter 5.0 Template', 'StarWriter 5.0 Vorlage/Template') ### 6 --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') - -@@ -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 - fmts.add('web', 'pdf', 'pdf', 'PDF - Portable Document Format', 'writer_web_pdf_Export') ### 10 --fmts.add('web', 'sdw3', 'sdw', 'StarWriter 3.0 (OpenOffice.org Writer/Web)', 'StarWriter 3.0 (StarWriter/Web)') ### 3 --fmts.add('web', 'sdw4', 'sdw', 'StarWriter 4.0 (OpenOffice.org Writer/Web)', 'StarWriter 4.0 (StarWriter/Web)') ### 4 --fmts.add('web', 'sdw', 'sdw', 'StarWriter 5.0 (OpenOffice.org Writer/Web)', 'StarWriter 5.0 (StarWriter/Web)') ### 5 - fmts.add('web', 'txt', 'txt', 'OpenOffice.org Text (OpenOffice.org Writer/Web)', 'writerweb8_writer') ### 12 - fmts.add('web', 'text10', 'txt', 'OpenOffice.org 1.0 Text Document (OpenOffice.org Writer/Web)', 'writer_web_StarOffice_XML_Writer') ### 15 - fmts.add('web', 'text', 'txt', 'Text (OpenOffice.org Writer/Web)', 'Text (StarWriter/Web)') ### 8 --fmts.add('web', 'vor4', 'vor', 'StarWriter/Web 4.0 Template', 'StarWriter/Web 4.0 Vorlage/Template') ### 6 --fmts.add('web', 'vor', 'vor', 'StarWriter/Web 5.0 Template', 'StarWriter/Web 5.0 Vorlage/Template') ### 7 - - ### Spreadsheet - fmts.add('spreadsheet', 'csv', 'csv', 'Text CSV', 'Text - txt - csv (StarCalc)') ### 16 -@@ -401,17 +388,10 @@ fmts.add('spreadsheet', 'ods', 'ods', 'ODF Spreadsheet', 'calc8') ### 15 - fmts.add('spreadsheet', 'ooxml', 'xml', 'Microsoft Excel 2003 XML', 'MS Excel 2003 XML') ### 23 - fmts.add('spreadsheet', 'ots', 'ots', 'ODF Spreadsheet Template', 'calc8_template') ### 14 - fmts.add('spreadsheet', 'pdf', 'pdf', 'Portable Document Format', 'calc_pdf_Export') ### 34 --fmts.add('spreadsheet', 'pxl', 'pxl', 'Pocket Excel', 'Pocket Excel') --fmts.add('spreadsheet', 'sdc', 'sdc', 'StarCalc 5.0', 'StarCalc 5.0') ### 31 --fmts.add('spreadsheet', 'sdc4', 'sdc', 'StarCalc 4.0', 'StarCalc 4.0') ### 11 --fmts.add('spreadsheet', 'sdc3', 'sdc', 'StarCalc 3.0', 'StarCalc 3.0') ### 29 - fmts.add('spreadsheet', 'slk', 'slk', 'SYLK', 'SYLK') ### 35 - fmts.add('spreadsheet', 'stc', 'stc', 'OpenOffice.org 1.0 Spreadsheet Template', 'calc_StarOffice_XML_Calc_Template') ### 2 - fmts.add('spreadsheet', 'sxc', 'sxc', 'OpenOffice.org 1.0 Spreadsheet', 'StarOffice XML (Calc)') ### 3 - fmts.add('spreadsheet', 'uos', 'uos', 'Unified Office Format spreadsheet', 'UOF spreadsheet') ### 9 --fmts.add('spreadsheet', 'vor3', 'vor', 'StarCalc 3.0 Template', 'StarCalc 3.0 Vorlage/Template') ### 18 --fmts.add('spreadsheet', 'vor4', 'vor', 'StarCalc 4.0 Template', 'StarCalc 4.0 Vorlage/Template') ### 19 --fmts.add('spreadsheet', 'vor', 'vor', 'StarCalc 5.0 Template', 'StarCalc 5.0 Vorlage/Template') ### 20 - fmts.add('spreadsheet', 'xhtml', 'xhtml', 'XHTML', 'XHTML Calc File') ### 26 - fmts.add('spreadsheet', 'xls', 'xls', 'Microsoft Excel 97/2000/XP', 'MS Excel 97') ### 12 - fmts.add('spreadsheet', 'xls5', 'xls', 'Microsoft Excel 5.0', 'MS Excel 5.0/95') ### 8 -@@ -443,12 +423,7 @@ fmts.add('graphics', 'svg', 'svg', 'Scalable Vector Graphics', 'draw_svg_Export' - fmts.add('graphics', 'svm', 'svm', 'StarView Metafile', 'draw_svm_Export') ### 55 - fmts.add('graphics', 'swf', 'swf', 'Macromedia Flash (SWF)', 'draw_flash_Export') ### 23 - fmts.add('graphics', 'sxd', 'sxd', 'OpenOffice.org 1.0 Drawing', 'StarOffice XML (Draw)') ### 26 --fmts.add('graphics', 'sxd3', 'sxd', 'StarDraw 3.0', 'StarDraw 3.0') ### 40 --fmts.add('graphics', 'sxd5', 'sxd', 'StarDraw 5.0', 'StarDraw 5.0') ### 44 --fmts.add('graphics', 'sxw', 'sxw', 'StarOffice XML (Draw)', 'StarOffice XML (Draw)') - fmts.add('graphics', 'tiff', 'tiff', 'Tagged Image File Format', 'draw_tif_Export') ### 13 --fmts.add('graphics', 'vor', 'vor', 'StarDraw 5.0 Template', 'StarDraw 5.0 Vorlage') ### 36 --fmts.add('graphics', 'vor3', 'vor', 'StarDraw 3.0 Template', 'StarDraw 3.0 Vorlage') ### 35 - fmts.add('graphics', 'wmf', 'wmf', 'Windows Metafile', 'draw_wmf_Export') ### 8 - fmts.add('graphics', 'xhtml', 'xhtml', 'XHTML', 'XHTML Draw File') ### 45 - fmts.add('graphics', 'xpm', 'xpm', 'X PixMap', 'draw_xpm_Export') ### 19 -@@ -479,9 +454,6 @@ fmts.add('presentation', 'ppt', 'ppt', 'Microsoft PowerPoint 97/2000/XP', 'MS Po - fmts.add('presentation', 'pwp', 'pwp', 'PlaceWare', 'placeware_Export') ### 30 - fmts.add('presentation', 'ras', 'ras', 'Sun Raster Image', 'impress_ras_Export') ### 27 - fmts.add('presentation', 'sda', 'sda', 'StarDraw 5.0 (OpenOffice.org Impress)', 'StarDraw 5.0 (StarImpress)') ### 8 --fmts.add('presentation', 'sdd', 'sdd', 'StarImpress 5.0', 'StarImpress 5.0') ### 6 --fmts.add('presentation', 'sdd3', 'sdd', 'StarDraw 3.0 (OpenOffice.org Impress)', 'StarDraw 3.0 (StarImpress)') ### 42 --fmts.add('presentation', 'sdd4', 'sdd', 'StarImpress 4.0', 'StarImpress 4.0') ### 37 - fmts.add('presentation', 'sxd', 'sxd', 'OpenOffice.org 1.0 Drawing (OpenOffice.org Impress)', 'impress_StarOffice_XML_Draw') ### 31 - fmts.add('presentation', 'sti', 'sti', 'OpenOffice.org 1.0 Presentation Template', 'impress_StarOffice_XML_Impress_Template') ### 5 - fmts.add('presentation', 'svg', 'svg', 'Scalable Vector Graphics', 'impress_svg_Export') ### 14 -@@ -490,10 +462,6 @@ fmts.add('presentation', 'swf', 'swf', 'Macromedia Flash (SWF)', 'impress_flash_ - fmts.add('presentation', 'sxi', 'sxi', 'OpenOffice.org 1.0 Presentation', 'StarOffice XML (Impress)') ### 41 - fmts.add('presentation', 'tiff', 'tiff', 'Tagged Image File Format', 'impress_tif_Export') ### 12 - fmts.add('presentation', 'uop', 'uop', 'Unified Office Format presentation', 'UOF presentation') ### 4 --fmts.add('presentation', 'vor', 'vor', 'StarImpress 5.0 Template', 'StarImpress 5.0 Vorlage') ### 40 --fmts.add('presentation', 'vor3', 'vor', 'StarDraw 3.0 Template (OpenOffice.org Impress)', 'StarDraw 3.0 Vorlage (StarImpress)') ###1 --fmts.add('presentation', 'vor4', 'vor', 'StarImpress 4.0 Template', 'StarImpress 4.0 Vorlage') ### 39 --fmts.add('presentation', 'vor5', 'vor', 'StarDraw 5.0 Template (OpenOffice.org Impress)', 'StarDraw 5.0 Vorlage (StarImpress)') ### 2 - fmts.add('presentation', 'wmf', 'wmf', 'Windows Metafile', 'impress_wmf_Export') ### 11 - fmts.add('presentation', 'xhtml', 'xml', 'XHTML', 'XHTML Impress File') ### 33 - fmts.add('presentation', 'xpm', 'xpm', 'X PixMap', 'impress_xpm_Export') ### 10 --- -1.9.0 - 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..6ab027c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0.9.0.tar.gz) = 37d63ada32675fd0ebd089a74db453fdb7332a24e62cbf3e060d6d15cc503c76ede9ccc5e09467f4a38833a8358c09fde23cc8780a77c343268f20e0c37f2469 +e6b33a2041137d8ebae1b71396ec0641 unoconv-0.3.tar.bz2 diff --git a/unoconv.spec b/unoconv.spec index 5dbf050..286aeb8 100644 --- a/unoconv.spec +++ b/unoconv.spec @@ -1,55 +1,69 @@ -Summary: A tool to convert documents from/to any format supported by LibreOffice +Summary: Tool to convert between any document format supported by OpenOffice.org 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 - -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 +Version: 0.3 +Release: 4%{?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.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch +Requires: openoffice.org-pyuno -BuildRequires: make -BuildRequires: asciidoc -BuildRequires: xmlto - -Requires: libreoffice-filters -Requires: libreoffice-pyuno -Suggests: libreoffice-writer2latex -Suggests: 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 OpenOffice.org understands. +It uses OpenOffice.org'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 -rm doc/%{name}.1 +%setup -q + +# Fix EOL encoding +sed 's|\r||' docs/unoconv.1.xml > docs/unoconv.1.xml.tmp +touch -r docs/unoconv.1.xml docs/unoconv.1.xml.tmp +mv -f docs/unoconv.1.xml.tmp docs/unoconv.1.xml %build -make %{?_smp_mflags} -asciidoc README.adoc %install -make install DESTDIR="%{buildroot}" prefix=%{_prefix} +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" + +%clean +rm -rf %{buildroot} %files -%doc AUTHORS ChangeLog README.html -%doc doc/errcode.html doc/filters.html doc/formats.html doc/selinux.html -%license COPYING +%defattr(-, root, root, -) +%doc AUTHORS ChangeLog COPYING README TODO WISHLIST docs/ tests/ %{_mandir}/man1/%{name}.1* %{_bindir}/%{name} %changelog -%autochangelog +* 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)