Accepting request 733583 from home:fstrba:maven

misc java fixes

OBS-URL: https://build.opensuse.org/request/show/733583
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=79
This commit is contained in:
Martin Pluskal 2019-09-27 07:59:04 +00:00 committed by Git OBS Bridge
parent 17bd0f606c
commit 68ecc1075f
2 changed files with 15 additions and 15 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 27 07:00:11 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Package also the protobuf-bom pom file
-------------------------------------------------------------------
Thu Aug 22 07:12:14 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -188,13 +188,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
%if %{with java}
pushd java
install -D -m 0644 %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java-%{version}.jar
ln -s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java.jar
ln -s %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
install -D -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-parent-%{version}.pom
%add_maven_depmap %{name}-parent-%{version}.pom
install -D -m 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-java-%{version}.pom
%add_maven_depmap %{name}-java-%{version}.pom %{name}-java-%{version}.jar
install -D -m 0644 %{name}-java-%{version}.jar %{buildroot}%{_javadir}/%{name}-java.jar
ln -s %{name}-java.jar %{buildroot}%{_javadir}/%{name}.jar
install -D -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-parent.pom
%add_maven_depmap %{name}-parent.pom
install -D -m 0644 bom/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-bom.pom
%add_maven_depmap %{name}-bom.pom
install -D -m 0644 core/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-java.pom
%add_maven_depmap %{name}-java.pom %{name}-java.jar
popd
%endif
@ -252,14 +253,8 @@ find %{buildroot}%{src_install_dir} -type f -name ".gitignore" -exec rm -f "{}"
%{src_install_dir}
%if %{with java}
%files -n %{name}-java
%{_javadir}/protobuf*
%{_mavenpomdir}/protobuf*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files -n %{name}-java -f java/.mfiles
%{_javadir}/%{name}.jar
%endif
%if %{with python2}