rpms/apache-commons-jxpath
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Migrate from Tomcat 6 to Tomcat 7

Browse Source 
- Resolves: rhbz#913879
This commit is contained in:
Mikolaj Izdebski 2013-02-26 16:09:16 +01:00
parent 6984cc5453
commit b84c00e6cd
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache-commons-jxpath.spec
View File

@ -3,15 +3,13 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.3 Version: 1.3
Release: 14%{?dist} Release: 15%{?dist}
Summary: Simple XPath interpreter Summary: Simple XPath interpreter
Group: Development/Libraries Group: Development/Libraries
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/ URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
# Depmap needed to bend servlet-api and jsp-api to tomcat6
Source1: %{short_name}.depmap
Patch0: %{short_name}-mockrunner.patch Patch0: %{short_name}-mockrunner.patch
BuildArch: noarch BuildArch: noarch
@ -28,7 +26,7 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-plugin-bundle BuildRequires: maven-plugin-bundle
BuildRequires: maven-resources-plugin BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-plugin
BuildRequires: servlet25 BuildRequires: servlet
BuildRequires: jsp BuildRequires: jsp
BuildRequires: el_api BuildRequires: el_api
@ -59,7 +57,7 @@ This package contains the API documentation for %{name}.
# we are skipping tests because we don't have com.mockrunner in repos yet # we are skipping tests because we don't have com.mockrunner in repos yet
%mvn_file : %{short_name} %{name} %mvn_file : %{short_name} %{name}
%mvn_alias : org.apache.commons:%{short_name} %mvn_alias : org.apache.commons:%{short_name}
%mvn_build -f -D "%{SOURCE1}" %mvn_build -f
%install %install
%mvn_install %mvn_install
@ -77,6 +75,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Tue Feb 26 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-15
- Migrate from Tomcat 6 to Tomcat 7
- Resolves: rhbz#913879
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-14 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

22
commons-jxpath.depmap
View File

@ -1,22 +0,0 @@
<dependencies>
<dependency>
<maven>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-servlet-2.5-api</artifactId>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>tomcat6-jsp-2.1-api</artifactId>
</jpp>
</dependency>
</dependencies>