packages/velocity-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 Remove dependence on sslext

Browse Source 
From: @wang--ge
Reviewed-by: @wangchong1995924
Signed-off-by: @wangchong1995924
This commit is contained in:
openeuler-ci-bot 2021-02-04 14:46:42 +08:00 committed by Gitee
commit 4f68b1aa2f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
velocity-tools.spec
View File

@ -1,6 +1,6 @@
Name: velocity-tools Name: velocity-tools
Version: 2.0 Version: 2.0
Release: 1 Release: 2
Summary: Collection of useful tools for Velocity template engine Summary: Collection of useful tools for Velocity template engine
License: ASL 2.0 License: ASL 2.0
Url: http://velocity.apache.org/tools/releases/2.0/ Url: http://velocity.apache.org/tools/releases/2.0/
@ -19,7 +19,7 @@ BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.struts:struts-core) mvn(org.apache.struts:struts-taglib) BuildRequires: mvn(org.apache.struts:struts-core) mvn(org.apache.struts:struts-taglib)
BuildRequires: mvn(org.apache.struts:struts-tiles) mvn(org.apache.tomcat:tomcat-jsp-api) BuildRequires: mvn(org.apache.struts:struts-tiles) mvn(org.apache.tomcat:tomcat-jsp-api)
BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) mvn(org.apache.velocity:velocity) BuildRequires: mvn(org.apache.tomcat:tomcat-servlet-api) mvn(org.apache.velocity:velocity)
BuildRequires: mvn(oro:oro) mvn(sslext:sslext) mvn(org.apache.tomcat:tomcat-el-api) BuildRequires: mvn(oro:oro) mvn(org.apache.tomcat:tomcat-el-api)
%if 0 %if 0
BuildRequires: mvn(httpunit:httpunit) = 1.6.1 mvn(nekohtml:nekohtml) = 0.9.5 BuildRequires: mvn(httpunit:httpunit) = 1.6.1 mvn(nekohtml:nekohtml) = 0.9.5
BuildRequires: mvn(org.mortbay.jetty:jetty-embedded) = 6.0.1 mvn(rhino:js) = 1.6R5 BuildRequires: mvn(org.mortbay.jetty:jetty-embedded) = 6.0.1 mvn(rhino:js) = 1.6R5
@ -42,6 +42,7 @@ This package contains javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-%{version}-src %setup -q -n %{name}-%{version}-src
find . -name "SecureLinkTool.java" -delete
find . -name "*.jar" -delete find . -name "*.jar" -delete
find . -name "*.class" -delete find . -name "*.class" -delete
%patch0 -p1 %patch0 -p1
@ -50,6 +51,7 @@ find . -name "*.class" -delete
%patch3 -p1 %patch3 -p1
sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt
%pom_remove_dep javax.servlet:servlet-api %pom_remove_dep javax.servlet:servlet-api
%pom_remove_dep sslext:sslext
%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided %pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
%pom_add_dep org.apache.tomcat:tomcat-jsp-api::provided %pom_add_dep org.apache.tomcat:tomcat-jsp-api::provided
%pom_xpath_remove "pom:project/pom:build/pom:outputDirectory" %pom_xpath_remove "pom:project/pom:build/pom:outputDirectory"
@ -76,5 +78,8 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Tue Jan 26 2021 Ge Wang <wangge20@huawei.com> - 2.0-2
- remove dependence to sslext
* Wed Aug 19 2020 maminjie <maminjie1@huawei.com> - 2.0-1 * Wed Aug 19 2020 maminjie <maminjie1@huawei.com> - 2.0-1
- package init - package init