Accepting request 645573 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/645573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-beanutils?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2018-10-31 12:21:11 +00:00 committed by Git OBS Bridge
commit bc1ea20c13
2 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Oct 23 17:30:33 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Cleanup the maven pom files installation
-------------------------------------------------------------------
Fri Sep 21 07:44:23 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -32,6 +32,8 @@ BuildRequires: ant
BuildRequires: commons-collections
BuildRequires: commons-logging
BuildRequires: fdupes
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: xml-commons-apis
Requires: commons-collections >= 2.0
Requires: commons-logging >= 1.0
@ -74,16 +76,19 @@ ant -Dbuild.sysclasspath=first dist
%install
# jars
install -d -m 755 %{buildroot}%{_javadir}
install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
pushd %{buildroot}%{_javadir}
ln -s %{name}-%{version}.jar %{name}.jar
for jar in *.jar; do
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
done
popd # come back from javadir
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a "org.apache.commons:%{short_name}"
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@ -95,7 +100,12 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%license LICENSE.txt
%doc NOTICE.txt RELEASE-NOTES.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files javadoc
%defattr(0644,root,root,0755)