[svn] r5498 - trunk/tools/unoconv

[packagers at lists.rpmforge.net]

Author: dag
Date: 2007-06-12 01:11:19 +0200 (Tue, 12 Jun 2007)
New Revision: 5498

Modified:
   trunk/tools/unoconv/ChangeLog
   trunk/tools/unoconv/unoconv
   trunk/tools/unoconv/unoconv.spec
Log:
Added MacOSX NeoOffice path /Applications/NeoOffice.app/Contents/program/ (Peter Stevens)

Modified: trunk/tools/unoconv/ChangeLog
===================================================================
--- trunk/tools/unoconv/ChangeLog	2007-06-11 22:24:16 UTC (rev 5497)
+++ trunk/tools/unoconv/ChangeLog	2007-06-11 23:11:19 UTC (rev 5498)
@@ -2,6 +2,7 @@
 - Determine doctype from input filename (if not specified)
 - Created a seperate class and allow to use as a library (like DocumentConverter.py)
 - Makefile now adds symlinks for different ODF formats like eg, odt2pdf or odp2pdf
+- Added MacOSX NeoOffice path '/Applications/NeoOffice.app/Contents/program/' (Peter Stevens)
 
 * 0.2 - released 20/05/2007
 - Added support for almost 100 graphics, presentation and spreadsheet documents

Modified: trunk/tools/unoconv/unoconv
===================================================================
--- trunk/tools/unoconv/unoconv	2007-06-11 22:24:16 UTC (rev 5497)
+++ trunk/tools/unoconv/unoconv	2007-06-11 23:11:19 UTC (rev 5498)
@@ -20,13 +20,13 @@
     import uno
 except:
 #    extrapaths = ('/usr/lib/openoffice/program/', '/usr/lib/openoffice.org2.0/program/')
-    extrapaths = glob.glob('/usr/lib*/openoffice*/program/')
+    extrapaths = glob.glob('/usr/lib*/openoffice*/program/') + [ '/Applications/NeoOffice.app/Contents/program', ]
     for path in extrapaths:
         if os.path.isfile(os.path.join(path, 'pyuno.so')):
             sys.path.append(path)
             break
     else:
-        print >>sys.stderr, "unoconv: Cannot find the pyuno.so library."
+        print >>sys.stderr, "unoconv: Cannot find the pyuno.so library in sys.path."
         print >>sys.stderr, "Please locate this library and send feedback to <tools at lists.rpmforge.net>."
         sys.exit(1)
 
@@ -292,7 +292,7 @@
 
         ### Make it easier for people to use a doctype (first letter is enough)
         if self.doctype:
-            for d in doctypes:
+            for doctype in doctypes:
                 if self.doctype[0] == doctype[0]:
                     self.doctype = doctype
 

Modified: trunk/tools/unoconv/unoconv.spec
===================================================================
--- trunk/tools/unoconv/unoconv.spec	2007-06-11 22:24:16 UTC (rev 5497)
+++ trunk/tools/unoconv/unoconv.spec	2007-06-11 23:11:19 UTC (rev 5498)
@@ -8,7 +8,7 @@
 
 Summary: Tool to convert between any document format supported by OpenOffice
 Name: unoconv
-Version: 0.2
+Version: 0.2svn
 Release: 1
 License: GPL
 Group: System Environment/Base
@@ -57,6 +57,9 @@
 %{_bindir}/unoconv
 
 %changelog
+* Tue May 22 2007 Dag Wieers <dag at wieers.com> - 0.2svn-1
+- Updated to release 0.2svn.
+
 * Sun May 20 2007 Dag Wieers <dag at wieers.com> - 0.2-1
 - Updated to release 0.2.