Author: caleb Date: Fri Jan 28 13:57:22 2011 GMT Module: packages Tag: HEAD ---- Log message: - Patch for possible libreoffice install paths - Rel 2
---- Files affected: packages/unoconv: unoconv.spec (1.5 -> 1.6) , unoconv-libreoffice.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/unoconv/unoconv.spec diff -u packages/unoconv/unoconv.spec:1.5 packages/unoconv/unoconv.spec:1.6 --- packages/unoconv/unoconv.spec:1.5 Mon Jan 3 13:52:18 2011 +++ packages/unoconv/unoconv.spec Fri Jan 28 14:57:17 2011 @@ -2,12 +2,13 @@ Summary: Tool to convert between any document format supported by OpenOffice Name: unoconv Version: 0.4 -Release: 1 +Release: 2 License: GPL Group: Base Source0: http://dag.wieers.com/home-made/unoconv/%{name}-%{version}.tar.bz2 # Source0-md5: 64cd2c3b0823d329890c0bedffdfa6ae Patch1: %{name}-ld_library_path.patch +Patch2: %{name}-libreoffice.patch URL: http://dag.wieers.com/home-made/unoconv/ BuildRequires: python >= 2.0 BuildRequires: rpm-pythonprov @@ -31,6 +32,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p0 %build @@ -55,6 +57,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2011/01/28 13:57:17 caleb +- Patch for possible libreoffice install paths +- Rel 2 + Revision 1.5 2011/01/03 12:52:18 caleb - Require generic name of provide offered by libreoffice or openoffice.org ================================================================ Index: packages/unoconv/unoconv-libreoffice.patch diff -u /dev/null packages/unoconv/unoconv-libreoffice.patch:1.1 --- /dev/null Fri Jan 28 14:57:22 2011 +++ packages/unoconv/unoconv-libreoffice.patch Fri Jan 28 14:57:17 2011 @@ -0,0 +1,16 @@ +--- unoconv~ 2010-10-23 13:50:34.000000000 +0300 ++++ unoconv 2011-01-28 15:31:22.462083834 +0200 +@@ -23,11 +23,13 @@ + extrapaths = glob.glob('/usr/lib*/openoffice*/program') + \ + glob.glob('/usr/lib*/openoffice*/basis*/program') + \ + glob.glob('/usr/lib*/ooo*/program') + \ ++ glob.glob('/usr/lib*/libreoffice/program') + \ + glob.glob('/usr/lib*/ooo*/basis*/program') + \ + glob.glob('/usr/local/openoffice*/program') + \ + glob.glob('/usr/local/openoffice*/basis*/program') + \ + glob.glob('/usr/local/ooo*/program') + \ + glob.glob('/usr/local/ooo*/basis*/program') + \ ++ glob.glob('/usr/lib*/libreoffice/basis*/program') + \ + glob.glob('/opt/openoffice*/program') + \ + glob.glob('/opt/openoffice*/basis*/program') + \ + glob.glob('/Applications/OpenOffice.org.app/Contents/program') + \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unoconv/unoconv.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
