commit 8662bff326ce486f1ae29710da1434833073934c
Author: gil <puntogil(a)libero.it>
Date: Fri Jun 29 10:56:19 2012 +0200
replace tomcat 7.x apis with jboss apis
struts.spec | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index 0ae5e5b..289a0c9 100644
--- a/struts.spec
+++ b/struts.spec
@@ -1,11 +1,7 @@
%global master_version 4
Name: struts
Version: 1.3.10
-<<<<<<< HEAD
-Release: 3%{?dist}
-=======
Release: 4%{?dist}
->>>>>>> master
Summary: Web application framework
Group: Development/Libraries
License: ASL 2.0
@@ -20,13 +16,6 @@ Source0: %{name}-%{version}-clean-src.tar.gz
Source1: %{name}-master-%{master_version}-pom.xml
# add struts-master relativePath
Patch0: %{name}-%{version}-parent-pom.patch
-<<<<<<< HEAD
-# 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
-=======
# add
# org.jboss.spec.javax.el jboss-el-api_2.2_spec
# org.apache.maven.plugins maven-resources-plugin configuration
@@ -40,7 +29,6 @@ Patch2: %{name}-%{version}-el-pom.patch
# maven-compiler-plugin build source/target
# build for junit servlet-3.0-api
Patch1: %{name}-%{version}-jboss.patch
->>>>>>> master
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -54,20 +42,11 @@ BuildRequires: apache-commons-logging
BuildRequires: apache-commons-validator
BuildRequires: bsf
BuildRequires: jakarta-oro
-<<<<<<< HEAD
-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
-
-=======
BuildRequires: jboss-el-2.2-api
BuildRequires: jboss-jsf-2.1-api
BuildRequires: jboss-jsp-2.2-api
BuildRequires: jboss-jstl-1.2-api
BuildRequires: jboss-servlet-3.0-api
->>>>>>> master
# not only a test dep
BuildRequires: junit
@@ -89,16 +68,11 @@ Requires: apache-commons-logging
Requires: apache-commons-validator
Requires: bsf
Requires: jakarta-oro
-<<<<<<< HEAD
-Requires: jboss-jsf-2.1-api
-Requires: jboss-jstl-1.2-api
-=======
Requires: jboss-el-2.2-api
Requires: jboss-jsf-2.1-api
Requires: jboss-jsp-2.2-api
Requires: jboss-jstl-1.2-api
Requires: jboss-servlet-3.0-api
->>>>>>> master
Requires: junit
Requires: java
@@ -138,7 +112,6 @@ find -name "*.jar" -delete
find -name "*.class" -delete
%patch0 -p0
%patch1 -p1
-%patch2 -p0
sed -i 's/\r//' LICENSE.txt NOTICE.txt
@@ -193,12 +166,9 @@ cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%doc LICENSE.txt NOTICE.txt
%changelog
-<<<<<<< HEAD
-=======
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-4
- replace tomcat 7.x apis with jboss apis
->>>>>>> master
* Fri Jun 29 2012 gil cattaneo <puntogil(a)libero.it> 1.3.10-3
- replace jakarta-taglibs-standard with jboss-jstl-1.2-api
Show replies by date