tomcat5 -> tomcat6 BRs/Rs
This commit is contained in:
spike
parent
e19b89a2e2
commit
4626078aad
@ -1,73 +1,68 @@
|
|||||||
|
|
||||||
%global base_name jxpath
|
%global base_name jxpath
|
||||||
%global short_name commons-%{base_name}
|
%global short_name commons-%{base_name}
|
||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.3
|
Version: 1.3
|
||||||
Release: 4%{?dist}
|
Release: 5%{?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
|
||||||
Patch0: %{short_name}-mockrunner.patch
|
# Depmap needed to bend servlet-api and jsp-api to tomcat6
|
||||||
BuildArch: noarch
|
Source1: %{short_name}.depmap
|
||||||
BuildRequires: apache-commons-beanutils
|
Patch0: %{short_name}-mockrunner.patch
|
||||||
BuildRequires: apache-commons-logging
|
BuildArch: noarch
|
||||||
BuildRequires: java-devel >= 1:1.6.0
|
|
||||||
BuildRequires: jpackage-utils >= 0:1.6
|
|
||||||
BuildRequires: tomcat5-jsp-2.0-api
|
|
||||||
BuildRequires: tomcat5
|
|
||||||
BuildRequires: maven-doxia-sitetools
|
|
||||||
BuildRequires: maven-plugin-build-helper
|
|
||||||
BuildRequires: maven-plugin-bundle
|
|
||||||
BuildRequires: maven-surefire-maven-plugin
|
|
||||||
BuildRequires: maven2-plugin-antrun
|
|
||||||
BuildRequires: maven2-plugin-assembly
|
|
||||||
BuildRequires: maven2-plugin-compiler
|
|
||||||
BuildRequires: maven2-plugin-install
|
|
||||||
BuildRequires: maven2-plugin-idea
|
|
||||||
BuildRequires: maven2-plugin-jar
|
|
||||||
BuildRequires: maven2-plugin-javadoc
|
|
||||||
BuildRequires: maven2-plugin-resources
|
|
||||||
BuildRequires: maven2-plugin-site
|
|
||||||
# change to apache-commons-collections once they are renamed
|
|
||||||
BuildRequires: jakarta-commons-collections >= 0:2.1.1
|
|
||||||
Requires: jakarta-commons-collections >= 0:2.1.1
|
|
||||||
Requires: apache-commons-logging
|
|
||||||
Requires: xml-commons-apis
|
|
||||||
Requires: xerces-j2
|
|
||||||
Requires: servletapi5
|
|
||||||
Requires: jdom >= 0:1.0
|
|
||||||
Requires: tomcat5-jsp-2.0-api
|
|
||||||
Requires: jpackage-utils >= 0:1.6
|
|
||||||
|
|
||||||
Requires(post): jpackage-utils >= 1.7.2
|
BuildRequires: java-devel >= 1:1.6.0
|
||||||
Requires(postun): jpackage-utils >= 1.7.2
|
BuildRequires: jpackage-utils
|
||||||
|
BuildRequires: maven2 >= 2.2.1
|
||||||
|
BuildRequires: maven-antrun-plugin
|
||||||
|
BuildRequires: maven-assembly-plugin
|
||||||
|
BuildRequires: maven-compiler-plugin
|
||||||
|
BuildRequires: maven-idea-plugin
|
||||||
|
BuildRequires: maven-install-plugin
|
||||||
|
BuildRequires: maven-jar-plugin
|
||||||
|
BuildRequires: maven-javadoc-plugin
|
||||||
|
BuildRequires: maven-plugin-bundle
|
||||||
|
BuildRequires: maven-resources-plugin
|
||||||
|
BuildRequires: maven-surefire-plugin
|
||||||
|
BuildRequires: servlet25
|
||||||
|
BuildRequires: jsp
|
||||||
|
BuildRequires: el_api
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Requires: java >= 1:1.6.0
|
||||||
|
Requires: jpackage-utils
|
||||||
|
Requires: jdom >= 0:1.0
|
||||||
|
Requires: apache-commons-beanutils
|
||||||
|
Requires: apache-commons-logging
|
||||||
|
|
||||||
|
Requires(post): jpackage-utils
|
||||||
|
Requires(postun): jpackage-utils
|
||||||
|
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
# This should go away with F-17
|
# This should go away with F-17
|
||||||
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
|
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
|
||||||
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
|
Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Defines a simple interpreter of an expression language called XPath.
|
Defines a simple interpreter of an expression language called XPath.
|
||||||
JXPath applies XPath expressions to graphs of objects of all kinds:
|
JXPath applies XPath expressions to graphs of objects of all kinds:
|
||||||
JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
|
JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: API documentation for %{name}
|
Summary: API documentation for %{name}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
|
|
||||||
# This should go away with F-17
|
# This should go away with F-17
|
||||||
Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release}
|
Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release}
|
||||||
Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
|
Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
%{summary}.
|
This package contains the API documentation for %{name}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{short_name}-%{version}-src
|
%setup -q -n %{short_name}-%{version}-src
|
||||||
@ -79,6 +74,9 @@ mkdir -p $MAVEN_REPO_LOCAL
|
|||||||
|
|
||||||
# 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-jpp \
|
mvn-jpp \
|
||||||
|
-e \
|
||||||
|
-Dmaven2.jpp.mode=true \
|
||||||
|
-Dmaven2.jpp.depmap.file="%{SOURCE1}" \
|
||||||
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
|
||||||
-Dmaven.test.skip=true \
|
-Dmaven.test.skip=true \
|
||||||
install javadoc:javadoc
|
install javadoc:javadoc
|
||||||
@ -133,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_javadocdir}/%{name}-%{version}
|
%{_javadocdir}/%{name}-%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 21 2010 Chris Spike <chris.spike@arcor.de> 1.3-5
|
||||||
|
- tomcat5 -> tomcat6 BRs/Rs
|
||||||
|
|
||||||
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.3-4
|
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.3-4
|
||||||
- Add license to javadoc subpackage
|
- Add license to javadoc subpackage
|
||||||
|
|
||||||
|
|||||||
22
commons-jxpath.depmap
Normal file
22
commons-jxpath.depmap
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
<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>
|
||||||
Loading…
Reference in New Issue
Block a user