- Added patch to remove use of LD_LIBRARY_PATH not in PLD

Changed files:
    unoconv-ld_library_path.patch -> 1.1
    unoconv.spec -> 1.4

diff --git a/unoconv-ld_library_path.patch b/unoconv-ld_library_path.patch
new file mode 100644 (file)
index 0000000..018e391
--- /dev/null
+++ b/unoconv-ld_library_path.patch
@@ -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)

diff --git a/unoconv.spec b/unoconv.spec
index 95e7835bfcdaed247394353ee4f9760a3b910630..66123125b4c46657b1e759ddf13381ab9d9fac31 100644 (file)
--- a/unoconv.spec
+++ b/unoconv.spec
@@ -6,6 +6,7 @@ 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
 URL:           http://dag.wieers.com/home-made/unoconv/
 BuildRequires: python >= 2.0
 BuildRequires: rpm-pythonprov
@@ -28,6 +29,7 @@ PNG, JPG, SVG, BMP, EPS and many more...
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build