This commit is contained in:
parent
f2df007708
commit
8a33d90c90
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 2 20:24:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Remove references to the hamcrest-parent pom and do not
|
||||||
|
distribute it
|
||||||
|
* useless since we don't build with maven
|
||||||
|
* creates problems with gradle connector
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jan 15 08:52:39 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Tue Jan 15 08:52:39 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -130,8 +130,14 @@ sed -i 's/@VERSION@/%{version}/g' pom/*.pom
|
|||||||
# jars
|
# jars
|
||||||
install -d -m 755 %{buildroot}%{_javadir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadir}/%{name}
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
|
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
|
||||||
install -m 644 pom/%{name}-parent.pom %{buildroot}%{_mavenpomdir}/%{name}/parent.pom
|
|
||||||
%add_maven_depmap %{name}/parent.pom -f core
|
rm -f pom/%{name}-parent.pom
|
||||||
|
for i in pom/%{name}*.pom; do
|
||||||
|
%pom_remove_parent ${i}
|
||||||
|
%pom_xpath_inject "pom:project" "
|
||||||
|
<groupId>org.hamcrest</groupId>
|
||||||
|
<version>%{version}</version>" ${i}
|
||||||
|
done
|
||||||
|
|
||||||
install -m 644 build/%{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{name}/core.jar
|
install -m 644 build/%{name}-core-%{version}.jar %{buildroot}%{_javadir}/%{name}/core.jar
|
||||||
install -m 644 pom/%{name}-core.pom %{buildroot}%{_mavenpomdir}/%{name}/core.pom
|
install -m 644 pom/%{name}-core.pom %{buildroot}%{_mavenpomdir}/%{name}/core.pom
|
||||||
@ -162,28 +168,13 @@ cp -pr build/temp/hamcrest-all-%{version}-javadoc.jar.contents/* %{buildroot}%{_
|
|||||||
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
install -d -m 755 %{buildroot}%{_datadir}/%{name}
|
||||||
cp -pr %{name}-examples %{buildroot}%{_datadir}/%{name}/
|
cp -pr %{name}-examples %{buildroot}%{_datadir}/%{name}/
|
||||||
|
|
||||||
%files
|
%files -f .mfiles
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
%{_javadir}/%{name}/all.jar
|
|
||||||
%{_javadir}/%{name}/generator.jar
|
|
||||||
%{_javadir}/%{name}/integration.jar
|
|
||||||
%{_javadir}/%{name}/library.jar
|
|
||||||
%{_mavenpomdir}/%{name}/all.pom
|
|
||||||
%{_mavenpomdir}/%{name}/generator.pom
|
|
||||||
%{_mavenpomdir}/%{name}/integration.pom
|
|
||||||
%{_mavenpomdir}/%{name}/library.pom
|
|
||||||
%{_datadir}/maven-metadata/%{name}.xml*
|
|
||||||
|
|
||||||
%files core
|
%files core -f .mfiles-core
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
%dir %{_javadir}/%{name}
|
|
||||||
%dir %{_mavenpomdir}/%{name}
|
|
||||||
%{_javadir}/%{name}/core.jar
|
|
||||||
%{_mavenpomdir}/%{name}/parent.pom
|
|
||||||
%{_mavenpomdir}/%{name}/core.pom
|
|
||||||
%{_datadir}/maven-metadata/%{name}-core.xml*
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
|
Loading…
Reference in New Issue
Block a user