This commit is contained in:
parent
02e818ed8e
commit
8899ac119b
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 14 14:22:43 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
- BuildRequires: java-devel >= 1.6
|
||||||
|
- BuildConflicts: java-devel >= 1.9
|
||||||
|
* Allow building with wider range of java compilers
|
||||||
|
- Clean spec file
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Sep 10 06:41:34 UTC 2017 - fstrba@suse.com
|
Sun Sep 10 06:41:34 UTC 2017 - fstrba@suse.com
|
||||||
|
|
||||||
|
20
axis.spec
20
axis.spec
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
# icecream 0
|
|
||||||
|
|
||||||
|
|
||||||
Name: axis
|
Name: axis
|
||||||
@ -54,8 +53,7 @@ BuildRequires: classpath
|
|||||||
BuildRequires: classpathx-mail
|
BuildRequires: classpathx-mail
|
||||||
BuildRequires: gnu-jaf
|
BuildRequires: gnu-jaf
|
||||||
BuildRequires: jakarta-commons-discovery
|
BuildRequires: jakarta-commons-discovery
|
||||||
# JDK8 is the last one that is able to build with source and target levels 1.3
|
BuildRequires: java-devel >= 1.6
|
||||||
BuildRequires: java-devel = 1.8.0
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
@ -75,7 +73,7 @@ Requires: log4j
|
|||||||
Requires: wsdl4j
|
Requires: wsdl4j
|
||||||
Obsoletes: %{name}-javadoc
|
Obsoletes: %{name}-javadoc
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildConflicts: java-devel >= 1.9
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Apache Axis is an implementation of the SOAP ("Simple Object Access
|
Apache Axis is an implementation of the SOAP ("Simple Object Access
|
||||||
@ -93,7 +91,7 @@ Manual for axis
|
|||||||
|
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1 -b gcc44-build
|
%patch1 -p1 -b gcc44-build
|
||||||
%patch2 -p0
|
%patch2
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
|
||||||
# Remove provided binaries
|
# Remove provided binaries
|
||||||
@ -135,20 +133,19 @@ pushd build/lib
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
# POMs
|
# POMs
|
||||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
install -m 644 %{S:4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom
|
install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis.pom
|
||||||
%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar
|
%add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar
|
||||||
install -m 644 %{S:5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-ant.pom
|
install -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-axis-ant.pom
|
||||||
%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar
|
%add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar
|
||||||
install -m 644 %{S:6} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom
|
install -m 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxrpc.pom
|
||||||
%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar
|
%add_maven_depmap JPP.%{name}-jaxrpc.pom %{name}/jaxrpc.jar
|
||||||
install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom
|
install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.%{name}-saaj.pom
|
||||||
%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar
|
%add_maven_depmap JPP.%{name}-saaj.pom %{name}/saaj.jar
|
||||||
#install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
|
#install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
|
||||||
# % add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar
|
# % add_maven_depmap JPP.%{name}-axis-schema.pom %{name}/axis-schema.jar
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc LICENSE README release-notes.html changelog.html
|
%doc LICENSE README release-notes.html changelog.html
|
||||||
%dir %{_javadir}/%{name}
|
%dir %{_javadir}/%{name}
|
||||||
%{_javadir}/%{name}/*.jar
|
%{_javadir}/%{name}/*.jar
|
||||||
@ -156,7 +153,6 @@ install -m 644 %{S:7} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-saaj.pom
|
|||||||
%{_datadir}/maven-metadata/%{name}.xml
|
%{_datadir}/maven-metadata/%{name}.xml
|
||||||
|
|
||||||
%files manual
|
%files manual
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%doc docs/*
|
%doc docs/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user