[libreoffice/master-4.0] use system servlet-api.jar

David Tardon dtardon at fedoraproject.org
Mon Nov 26 12:39:08 UTC 2012


commit d7427b6b96fbc50261f4aa21ae23142e25d8d1f3
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Nov 26 13:23:05 2012 +0100

    use system servlet-api.jar

 libreoffice.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index f70da52..9570ef0 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -196,6 +196,8 @@ BuildRequires: java-devel
 BuildRequires: junit
 %endif
 BuildRequires: pentaho-reporting-flow-engine
+BuildRequires: tomcat-servlet-3.0-api
+
 # fonts needed for unit tests
 BuildRequires: liberation-mono-fonts >= 1.0
 BuildRequires: liberation-sans-fonts >= 1.0
@@ -903,8 +905,8 @@ touch autogen.lastrun
  --enable-ext-presenter-minimizer --enable-ext-nlpsolver \
  --enable-ext-wiki-publisher --enable-ext-report-builder \
  --enable-scripting-beanshell --enable-scripting-javascript \
- --without-system-servlet-api \
  --with-system-jars --with-vba-package-format="builtin" \
+ --with-servlet-api-jar=/usr/share/java/tomcat-servlet-api.jar \
  --with-system-libs --with-system-headers --with-system-mozilla \
  --without-system-npapi-headers --with-system-dicts \
  --with-external-dict-dir=/usr/share/myspell \


More information about the scm-commits mailing list