commit bdbc4cfea6685e038880de8ebf3419dbdb33f719 Author: gil puntogil@libero.it Date: Fri Nov 15 05:00:09 2013 +0100
use objectweb-asm3
jasperreports.spec | 125 ++++++++++++++++++--------------------------------- 1 files changed, 44 insertions(+), 81 deletions(-) --- diff --git a/jasperreports.spec b/jasperreports.spec index 01b19dd..4727f35 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: 6%{?dist} +Release: 7%{?dist} Summary: Report-generating tool Group: Development/Libraries License: LGPLv3+ @@ -54,14 +54,18 @@ BuildRequires: geronimo-saaj BuildRequires: groovy BuildRequires: hibernate3 BuildRequires: hibernate-jpa-2.0-api +%if %{?fedora} > 19 +BuildRequires: hsqldb1 +%else BuildRequires: hsqldb +%endif BuildRequires: itext-core BuildRequires: jaxen BuildRequires: jcommon BuildRequires: jexcelapi BuildRequires: jfreechart BuildRequires: log4j -BuildRequires: objectweb-asm +BuildRequires: objectweb-asm3 BuildRequires: rhino BuildRequires: springframework BuildRequires: springframework-beans @@ -80,7 +84,11 @@ 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 @@ -155,14 +163,18 @@ 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 groovy) lib/groovy-all-1.7.5.jar +%if %{?fedora} > 19 +ln -sf $(build-classpath hsqldb1) lib/hsqldb-1.8.0-10.jar +%else ln -sf $(build-classpath hsqldb) lib/hsqldb-1.8.0-10.jar +%endif ln -sf $(build-classpath itext) lib/iText-2.1.7.jar ln -sf $(build-classpath jaxen) lib/jaxen-1.1.1.jar ln -sf $(build-classpath jcommon) lib/jcommon-1.0.15.jar ln -sf $(build-classpath jfreechart/jfreechart) lib/jfreechart-1.0.12.jar ln -sf $(build-classpath jxl) lib/jxl-2.6.10.jar ln -sf $(build-classpath log4j) lib/log4j-1.2.15.jar -ln -sf $(build-classpath objectweb-asm/asm) lib/ +ln -sf $(build-classpath objectweb-asm3/asm) lib/ 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 @@ -189,84 +201,32 @@ sed -i 's|deprecation="true"|deprecation="false"|' build.xml %pom_remove_dep mondrian:mondrian %pom_remove_dep com.keypoint:png-encoder
-%pom_add_dep commons-codec:commons-codec:any:compile - -%pom_remove_dep org.beanshell:bsh -%pom_add_dep bsh:bsh:any:compile - -%pom_remove_dep eclipse:jdtcore -%pom_add_dep org.eclipse.jdt:core:any:compile - -%pom_remove_dep org.codehaus.groovy:groovy-all -%pom_add_dep org.codehaus.groovy:groovy:any:compile - -%pom_remove_dep jfree:jcommon -%pom_xpath_inject "pom:dependencies" " -<dependency> - <groupId>org.jfree</groupId> - <artifactId>jcommon</artifactId> - <version>1.0.15</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>gnujaxp</groupId> - <artifactId>gnujaxp</artifactId> - </exclusion> - </exclusions> -</dependency>" - -%pom_remove_dep jfree:jfreechart -%pom_xpath_inject "pom:dependencies" " -<dependency> - <groupId>org.jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.14</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>gnujaxp</groupId> - <artifactId>gnujaxp</artifactId> - </exclusion> - </exclusions> -</dependency>" - -%pom_remove_dep org.hibernate:hibernate -%pom_xpath_inject "pom:dependencies" " -<dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - </exclusions> -</dependency>" - -%pom_remove_dep commons-javaflow:commons-javaflow -%pom_add_dep org.apache.commons:commons-javaflow:any:compile - -# At the moment these deps don't provides maven files -%pom_remove_dep jaxen:jaxen -%pom_xpath_inject "pom:dependencies" " -<dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>system</scope> - <systemPath>$(build-classpath jaxen)</systemPath> -</dependency>" -%pom_remove_dep rhino:js -%pom_xpath_inject "pom:dependencies" " -<dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.7R1</version> - <scope>system</scope> - <systemPath>$(build-classpath rhino)</systemPath> -</dependency>" +%pom_add_dep commons-codec:commons-codec::compile + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'bsh']/pom:groupId" bsh +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'bsh']/pom:version" 1.3.0 + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'eclipse']/pom:groupId" org.eclipse.jdt +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jdtcore']/pom:artifactId" core + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:artifactId" groovy +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.groovy']/pom:version" 1.8.9 + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jcommon']/pom:groupId" org.jfree +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'jfreechart']/pom:groupId" org.jfree + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:artifactId" hibernate-core +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.hibernate']/pom:version" 3 + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'commons-javaflow']/pom:groupId" org.apache.commons + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.persistence']/pom:groupId" org.hibernate.javax.persistence +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'persistence-api']/pom:artifactId" hibernate-jpa-2.0-api + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'javax.xml.soap']/pom:groupId" org.apache.geronimo.specs +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'saaj-api']/pom:artifactId" geronimo-saaj_1.3_spec + +%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'rhino']/pom:groupId" org.mozilla
%build
@@ -303,6 +263,9 @@ rm -rf dist/docs/api %doc license.txt
%changelog +* Fri Nov 15 2013 gil cattaneo puntogil@libero.it 4.0.2-7 +- use objectweb-asm3 + * Sat Aug 03 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 4.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org