commit db2120766ce1499792cc8281ba4d0cb0fe10bd74
Author: gil <puntogil(a)libero.it>
Date: Wed Mar 4 13:52:48 2015 +0100
use servlet api 3.1
jasperreports.spec | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/jasperreports.spec b/jasperreports.spec
index 0fbee12..313bb30 100644
--- a/jasperreports.spec
+++ b/jasperreports.spec
@@ -3,7 +3,7 @@ Name: jasperreports
# xmlbeans >= 2.5.0
# castor-xml modules see also
https://bugzilla.redhat.com/show_bug.cgi?id=820676
Version: 4.0.2
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Report-generating tool
License: LGPLv3+
URL:
http://jasperforge.org/projects/jasperreports/
@@ -50,25 +50,27 @@ BuildRequires: bsh
BuildRequires: dom4j
BuildRequires: ecj >= 1:3.4.2-13
BuildRequires: geronimo-saaj
-BuildRequires: groovy18
BuildRequires: hibernate3
BuildRequires: hibernate-jpa-2.0-api
-%if %{?fedora} > 19
BuildRequires: hsqldb1
+%if %{?fedora} > 20
+BuildRequires: groovy18
+BuildRequires: log4j12
+BuildRequires: objectweb-asm3
%else
-BuildRequires: hsqldb
+BuildRequires: groovy
+BuildRequires: log4j
+BuildRequires: objectweb-asm
%endif
BuildRequires: itext-core
BuildRequires: jaxen
BuildRequires: jcommon
BuildRequires: jexcelapi
BuildRequires: jfreechart
-BuildRequires: log4j12
-BuildRequires: objectweb-asm3
BuildRequires: rhino
BuildRequires: springframework
BuildRequires: springframework-beans
-BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: glassfish-servlet-api
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
@@ -83,17 +85,13 @@ Requires: batik
Requires: bcel
Requires: ecj >= 1:3.4.2-13
Requires: geronimo-saaj
-%if %{?fedora} > 19
Requires: hsqldb1
-%else
-Requires: hsqldb
-%endif
Requires: itext-core
Requires: jcommon
Requires: jfreechart
Requires: springframework
Requires: springframework-beans
-Requires: tomcat-servlet-3.0-api
+Requires: glassfish-servlet-api
Requires: jpackage-utils
BuildArch: noarch
@@ -126,7 +124,6 @@ Documentation for %{name}.
%setup -q
find . -name 'PieChartReport.bak' -delete
%patch0 -p0
-sed -i "s|org.objectweb.asm|org.objectweb.distroshaded.asm|"
src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
%patch1 -p0
%patch2 -p1
%patch3 -p0
@@ -158,7 +155,6 @@ ln -sf $(build-classpath hibernate3/hibernate-core)
lib/hibernate3.jar
ln -sf $(build-classpath hibernate-jpa-2.0-api) lib/jpa.jar
ln -sf $(build-classpath springframework/spring-beans) lib/spring-beans-2.5.5.jar
ln -sf $(build-classpath springframework/spring-core) lib/spring-core-2.5.5.jar
-ln -sf $(build-classpath groovy18-1.8) lib/groovy-all-1.7.5.jar
%if %{?fedora} > 19
ln -sf $(build-classpath hsqldb1-1) lib/hsqldb-1.8.0-10.jar
%else
@@ -171,14 +167,18 @@ ln -sf $(build-classpath jfreechart/jfreechart)
lib/jfreechart-1.0.12.jar
ln -sf $(build-classpath jxl) lib/jxl-2.6.10.jar
%if %{?fedora} > 21
ln -sf $(build-classpath log4j12-1.2.17) lib/log4j-1.2.15.jar
+ln -sf $(build-classpath groovy18-1.8) lib/groovy-all-1.7.5.jar
+ln -sf $(build-classpath objectweb-asm3/asm-distroshaded) lib/asm.jar
+sed -i "s|org.objectweb.asm|org.objectweb.distroshaded.asm|"
src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
%else
ln -sf $(build-classpath log4j) lib/log4j-1.2.15.jar
+ln -sf $(build-classpath groovy) lib/groovy-all-1.7.5.jar
+ln -sf $(build-classpath objectweb-asm/asm) lib/asm.jar
%endif
-ln -sf $(build-classpath objectweb-asm3/asm-distroshaded) lib/asm.jar
ln -sf $(build-classpath poi/apache-poi) lib/poi-3.6.jar
ln -sf $(build-classpath rhino) lib/rhino-1.7R1.jar
ln -sf $(build-classpath geronimo-saaj) lib/saaj-api-1.3.jar
-ln -sf $(build-classpath tomcat-servlet-3.0-api) lib/servlet.jar
+ln -sf $(build-classpath glassfish-servlet-api) lib/servlet.jar
ln -sf $(build-classpath xalan-j2) lib/xalan-2.7.1.jar
ln -sf $(build-classpath xalan-j2-serializer) lib/serializer.jar
ln -sf $(build-classpath xerces-j2) lib/xercesImpl-2.7.0.jar
@@ -196,6 +196,8 @@ rm -rf src/net/sf/jasperreports/data/mondrian/* \
sed -i 's|deprecation="true"|deprecation="false"|' build.xml
+sed -i 's|target="1.5" source="1.5"|target="1.6"
source="1.6"|' build.xml
+
%pom_remove_dep net.sf.barcode4j:barcode4j
%pom_remove_dep net.sourceforge.barbecue:barbecue
%pom_remove_dep mondrian:mondrian
@@ -229,6 +231,10 @@ sed -i
's|deprecation="true"|deprecation="false"|' build.xml
%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId =
'rhino']/pom:groupId" org.mozilla
%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId =
'js']/pom:artifactId" rhino
+# Force usage of servlet 3.1
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId =
'javax.servlet']/pom:version" 3.1.0
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId =
'javax.servlet']/pom:artifactId" javax.servlet-api
+
%build
# DO NOT USE maven for build
@@ -265,6 +271,9 @@ rm -rf dist/docs/api
%license license.txt
%changelog
+* Wed Mar 04 2015 gil cattaneo <puntogil(a)libero.it> 4.0.2-12
+- use servlet api 3.1
+
* Fri Feb 06 2015 gil cattaneo <puntogil(a)libero.it> 4.0.2-11
- introduce license macro