1
0
Fridrich Strba 2019-02-28 07:25:18 +00:00 committed by Git OBS Bridge
parent 1401ef3652
commit 9bb7d8a7ef
3 changed files with 39 additions and 63 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 28 07:24:19 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Sanitize dependencies
- Build and distribute the javadoc too
-------------------------------------------------------------------
Tue Feb 5 12:29:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -26,25 +26,21 @@ License: Apache-2.0
Group: Development/Libraries/Java
URL: http://commons.apache.org/%{base_name}/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source1: %{short_name}.depmap
Patch0: %{short_name}-mockrunner.patch
Patch1: build.xml.patch
BuildRequires: ant
BuildRequires: apache-commons-beanutils
BuildRequires: el_api >= 3.0
BuildRequires: fdupes
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jdom
BuildRequires: jsp
BuildRequires: junit
BuildRequires: servlet >= 3.0
Requires: apache-commons-beanutils
Requires: apache-commons-logging
BuildRequires: tomcat-jsp-2_3-api
Requires: java >= 1.8
Requires: jdom >= 1.0
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
Provides: %{short_name} = %{version}-%{release}
BuildArch: noarch
%description
@ -52,52 +48,48 @@ Defines a simple interpreter of an expression language called XPath.
JXPath applies XPath expressions to graphs of objects of all kinds:
JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
%package javadoc
Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{short_name}-%{version}-src
%patch0 -p1
%patch1
%build
export CLASSPATH=$(build-classpath \
ant-launcher \
plexus/ \
junit \
jdom \
jsp \
apache-commons-beanutils \
target/commons-jxpath.jar \
):target/classes:target/test-classes
ant -Dmaven.mode.offline=true jar \
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-lib %{_datadir}/java
mkdir -p target/lib
build-jar-repository -s target/lib commons-beanutils jdom glassfish-servlet-api tomcat-jsp-2.3-api
%{ant} -Dmaven.mode.offline=true jar javadoc \
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-lib %{_javadir}
sed -i "s/@name@/%{short_name}/g" src/conf/MANIFEST.MF
sed -i "s/@version@/%{version}/g" src/conf/MANIFEST.MF
jar ufm target/%{short_name}.jar src/conf/MANIFEST.MF
%install
install -Dpm 644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
pushd %{buildroot}%{_javadir}
for jar in *-%{version}*; do
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
ln -sf ${jar} `echo $jar| sed "s|apache-\(.*\)-%{version}|\1|g"`
done
popd # come back from javadir
#jar
install -dm 0755 %{buildroot}%{_javadir}
install -pm 644 target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{last_path_segment}/
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar
install -dm 0755 %{buildroot}%{_mavenpomdir}
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar -a org.apache.commons:%{short_name}
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files
%defattr(0644,root,root,0755)
%files -f .mfiles
%license LICENSE.txt
%{_javadir}/*.jar
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%{_javadir}/%{short_name}.jar
%files javadoc
%license LICENSE.txt
%{_javadocdir}/%{name}
%changelog

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>