As requested

ChangeLog

@@ -33,9 +33,9 @@
 * 0.4 - released 20/10/2010
 - Now properly check if there is a GUI attached and terminate() or -unaccept instance
 - Added official OpenOffice path '/opt/openoffice*/program'
-- Added support for OpenOffice on Windows (Fernando Lucas Rodriguez)
-- Added --pipe option to communicate with UNO pipe (Fernando Lucas Rodriguez)
-- Added -o/--outputpath option to modify the output path (Fernando Lucas Rodriguez)
+- Added support for OpenOffice on Windows (*redacted*)
+- Added --pipe option to communicate with UNO pipe (*redacted*)
+- Added -o/--outputpath option to modify the output path (*redacted*)
 - Added support for MediaWiki output (txt)
 - Added OpenOffice path to LD_LIBRARY_PATH env var
 - Added -nofirstwizard to ooffice invocations
@@ -57,9 +57,9 @@
 - Added docs/filters.txt with information about import and export filters
 - Added official OpenOffice path for MacOSX (Jeff Harmon)
 - First update links, then indexes (Nicolae Mihalache)
-- More improvements to OpenOffice support on Windows (Fernando Lucas Rodriguez)
-- Improve terminating OpenOffice on Windows (Fernando Lucas Rodriguez)
-- Support OpenOffice installations on Windows on drive-letters other than C: (Fernando Lucas Rodriguez)
+- More improvements to OpenOffice support on Windows (*redacted*)
+- Improve terminating OpenOffice on Windows (*redacted*)
+- Support OpenOffice installations on Windows on drive-letters other than C: (*redacted*)
 - Allow to apply a style template during conversion
 - Improvements to stdout and stderr messages consistency
 - Updated documentation

packaging/rpm/unoconv.spec

@@ -1,3 +1,5 @@
+%{?el6:%define _with_libreoffice 1}
+%{?el5:%define _with_openoffice.org 1}
 %{?el4:%define _with_openoffice.org2 1}
 
 %define rpmrelease %nil
@@ -16,7 +18,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 BuildRequires: python >= 2.0
 Requires: python >= 2.0
-%{!?_with_openoffice.org2:Requires:openoffice.org-pyuno >= 2.0}
+%{?_with_libreoffice:Requires:libreoffice.org-pyuno >= 1:3.4}
+%{?_with_openoffice.org:Requires:openoffice.org-pyuno >= 3.0}
 %{?_with_openoffice.org2:Requires:openoffice.org2-pyuno >= 2.0}
 
 %description

tests/Makefile

@@ -1,5 +1,8 @@
 ### Please modify and send me improvements
 
+python=/opt/libreoffice4.4/program/python
+unoconv=../unoconv
+
 all: clean doc6 doc95 doc docbook fodt html mediawiki ooxml pdf rtf sdw3 sdw4 sdw sxw text txt uot xhtml
 	@echo "== Tests finished."
 
@@ -13,7 +16,7 @@ all: clean doc6 doc95 doc docbook fodt html mediawiki ooxml pdf rtf sdw3 sdw4 sd
 %:
 #	-killall ooffice soffice.bin
 	@echo "- Convert document-example.odt to $@..."
-	-../unoconv -vvv -p 2002 -f $@ document-example.odt
+	-$(python) $(unoconv) -vvv -p 2002 -f $@ document-example.odt
 	@echo
 #	@ps aux | grep office
 #	-unoconv -f $@ dag.gif

unoconv

@@ -265,7 +265,7 @@ def python_switch(office):
         ### os.execv is broken on Windows and can't properly parse command line
         ### arguments and executable name if they contain whitespaces. subprocess
         ### fixes that behavior.
-        ret = subprocess.call([office.python] + sys.argv[0:])
+        ret = subprocess.call([office.python, ] + sys.argv[0:])
         sys.exit(ret)
     else: