Author: caleb Date: Sat Oct 23 10:52:55 2010 GMT Module: packages Tag: HEAD ---- Log message: - Added patch to remove use of LD_LIBRARY_PATH not in PLD
---- Files affected: packages/unoconv: unoconv.spec (1.3 -> 1.4) , unoconv-ld_library_path.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/unoconv/unoconv.spec diff -u packages/unoconv/unoconv.spec:1.3 packages/unoconv/unoconv.spec:1.4 --- packages/unoconv/unoconv.spec:1.3 Sat Oct 23 12:39:25 2010 +++ packages/unoconv/unoconv.spec Sat Oct 23 12:52:49 2010 @@ -7,6 +7,7 @@ Group: Base Source0: http://dag.wieers.com/home-made/unoconv/%{name}-%{version}.tar.bz2 # Source0-md5: 64cd2c3b0823d329890c0bedffdfa6ae +Patch1: %{name}-ld_library_path.patch URL: http://dag.wieers.com/home-made/unoconv/ BuildRequires: python >= 2.0 BuildRequires: rpm-pythonprov @@ -29,6 +30,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -53,6 +55,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.4 2010/10/23 10:52:49 caleb +- Added patch to remove use of LD_LIBRARY_PATH not in PLD + Revision 1.3 2010/10/23 10:39:25 caleb - Up to 0.4 - Removed patch added upstream ================================================================ Index: packages/unoconv/unoconv-ld_library_path.patch diff -u /dev/null packages/unoconv/unoconv-ld_library_path.patch:1.1 --- /dev/null Sat Oct 23 12:52:55 2010 +++ packages/unoconv/unoconv-ld_library_path.patch Sat Oct 23 12:52:49 2010 @@ -0,0 +1,11 @@ +--- unoconv-0.4/unoconv~ 2010-10-20 12:56:26.000000000 +0300 ++++ unoconv-0.4/unoconv 2010-10-23 13:46:42.987483669 +0300 +@@ -64,7 +64,7 @@ + sys.path.append(oolibpath) + import uno, unohelper + ### Export an environment that OpenOffice is pleased to work with +- os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + os.environ['LD_LIBRARY_PATH'] ++ os.environ['LD_LIBRARY_PATH'] = oolibpath + os.pathsep + break + except ImportError, e: + sys.path.remove(oolibpath) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/unoconv/unoconv.spec?r1=1.3&r2=1.4&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
