[ooo2gd] set properties on cmdline

David Tardon dtardon at fedoraproject.org
Thu Sep 1 09:51:09 UTC 2011


commit dafc29340bc612d389ad4665a5e5c1f1e33de9e4
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Sep 1 11:50:43 2011 +0200

    set properties on cmdline

 ooo2gd.spec |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/ooo2gd.spec b/ooo2gd.spec
index b7db04f..3389b7c 100644
--- a/ooo2gd.spec
+++ b/ooo2gd.spec
@@ -43,21 +43,19 @@ So, you can:
 %setup -q -n %{name}
 %setup -q -n %{name} -T -D -a 1
 rm -r libs
-. %{ooosdkenv}
-(
-    echo libreoffice.sdk.classpath=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar
-    echo office.program.dir=${OFFICE_PROGRAM_PATH}
-    echo oo.unotypes.rdb=${OO_SDK_URE_HOME}/share/misc/types.rdb
-    echo oo.offapi.rdb=${OFFICE_BASE_PROGRAM_PATH}/offapi.rdb
-    echo oo.sdk.dir=${OO_SDK_HOME}
-    echo sdk.bin.dir=${OO_SDK_HOME}/bin
-    echo ure.bin.dir=${OO_SDK_URE_BIN_DIR}
-) >> nbproject/project-uno.properties
 
 
 %build
 . %{ooosdkenv}
-ant uno-package
+ant \
+    -Dlibreoffice.sdk.classpath=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar \
+    -Doffice.program.dir=${OFFICE_PROGRAM_PATH} \
+    -Doo.unotypes.rdb=${OO_SDK_URE_HOME}/share/misc/types.rdb \
+    -Doo.offapi.rdb=${OFFICE_BASE_PROGRAM_PATH}/offapi.rdb \
+    -Doo.sdk.dir=${OO_SDK_HOME} \
+    -Dsdk.bin.dir=${OO_SDK_HOME}/bin \
+    -Dure.bin.dir=${OO_SDK_URE_BIN_DIR} \
+    uno-package
 
 
 %install


More information about the scm-commits mailing list