commit 7ade935a4fa801e8c89b006b1e110391007da07c Author: gil puntogil@libero.it Date: Fri Jun 29 09:33:28 2012 +0200
replace jakarta-taglibs-standard with jboss-jstl-1.2-api
struts.spec | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) --- diff --git a/struts.spec b/struts.spec index fdd0c80..54c2199 100644 --- a/struts.spec +++ b/struts.spec @@ -1,7 +1,7 @@ %global master_version 4 Name: struts Version: 1.3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Web application framework Group: Development/Libraries License: ASL 2.0 @@ -21,6 +21,8 @@ Patch0: %{name}-%{version}-parent-pom.patch # fix build for junit servlet-3.0-api # change myfaces myfaces-jsf-api 1.0.9 with org.jboss.spec.javax.faces jboss-jsf-api_2.1_spec Patch1: %{name}-%{version}-build.patch +# replace jakarta-taglibs-standard with jboss-jstl-1.2-api +Patch2: %{name}-%{version}-el-pom.patch
BuildRequires: java-devel BuildRequires: jpackage-utils @@ -34,8 +36,8 @@ BuildRequires: apache-commons-logging BuildRequires: apache-commons-validator BuildRequires: bsf BuildRequires: jakarta-oro -BuildRequires: jakarta-taglibs-standard >= 1.1.2-5 BuildRequires: jboss-jsf-2.1-api +BuildRequires: jboss-jstl-1.2-api BuildRequires: tomcat-el-2.2-api BuildRequires: tomcat-jsp-2.2-api BuildRequires: tomcat-servlet-3.0-api @@ -61,8 +63,8 @@ Requires: apache-commons-logging Requires: apache-commons-validator Requires: bsf Requires: jakarta-oro -Requires: jakarta-taglibs-standard >= 1.1.2-5 Requires: jboss-jsf-2.1-api +Requires: jboss-jstl-1.2-api Requires: junit Requires: tomcat-el-2.2-api Requires: tomcat-jsp-2.2-api @@ -105,6 +107,7 @@ find -name "*.jar" -delete find -name "*.class" -delete %patch0 -p0 %patch1 -p1 +%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -160,6 +163,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE.txt NOTICE.txt
%changelog +* Fri Jun 29 2012 gil cattaneo puntogil@libero.it 1.3.10-3 +- replace jakarta-taglibs-standard with jboss-jstl-1.2-api + * Sat Jun 23 2012 gil cattaneo puntogil@libero.it 1.3.10-2 - removed non-free resources