rpms/xmvn
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove temporary workaround

Browse Source 
<<<<<<< HEAD
This commit is contained in:
Mikolaj Izdebski 2017-06-21 18:28:49 +02:00
parent 5d81a4a776
commit 063806dc0b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xmvn.spec
View File

@ -10,7 +10,7 @@
Name: xmvn Name: xmvn
Version: 3.0.0 Version: 3.0.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: Local Extensions for Apache Maven Summary: Local Extensions for Apache Maven
License: ASL 2.0 License: ASL 2.0
URL: https://fedora-java.github.io/xmvn/ URL: https://fedora-java.github.io/xmvn/
@ -42,8 +42,6 @@ BuildRequires: plexus-containers-component-metadata
%if %{with gradle} %if %{with gradle}
BuildRequires: gradle >= 2.5 BuildRequires: gradle >= 2.5
%endif %endif
# XXX temp hack to unbreak buildroot
BuildRequires: tycho
Requires: %{name}-minimal = %{version}-%{release} Requires: %{name}-minimal = %{version}-%{release}
Requires: maven >= 3.4.0 Requires: maven >= 3.4.0
@ -241,8 +239,7 @@ chmod -R +rwX %{name}-%{version}*
# These are installed as doc # These are installed as doc
rm -f %{name}-%{version}*/{AUTHORS-XMVN,README-XMVN.md,LICENSE,NOTICE,NOTICE-XMVN} rm -f %{name}-%{version}*/{AUTHORS-XMVN,README-XMVN.md,LICENSE,NOTICE,NOTICE-XMVN}
# Not needed - we use JPackage launcher scripts # Not needed - we use JPackage launcher scripts
# XXX apparently still needed rm -Rf %{name}-%{version}*/lib/{installer,resolver,subst,bisect}/
#rm -Rf %{name}-%{version}*/lib/{installer,resolver,subst,bisect}/
# Irrelevant Maven launcher scripts # Irrelevant Maven launcher scripts
rm -f %{name}-%{version}*/bin/{mvn.cmd,mvnDebug.cmd,mvn-script} rm -f %{name}-%{version}*/bin/{mvn.cmd,mvnDebug.cmd,mvn-script}
@ -304,8 +301,6 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
%{_datadir}/%{name}/bin/mvnyjp %{_datadir}/%{name}/bin/mvnyjp
%{_datadir}/%{name}/boot %{_datadir}/%{name}/boot
%{_datadir}/%{name}/conf %{_datadir}/%{name}/conf
# XXX
%{_datadir}/%{name}/lib
%files parent-pom -f .mfiles-xmvn-parent %files parent-pom -f .mfiles-xmvn-parent
%doc LICENSE NOTICE %doc LICENSE NOTICE
@ -344,6 +339,9 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/
%doc LICENSE NOTICE %doc LICENSE NOTICE
%changelog %changelog
* Wed Jun 21 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-5
- Remove temporary workaround
* Wed Jun 21 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-4 * Wed Jun 21 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0-4
- Fix installer crash when plugin directory is missing - Fix installer crash when plugin directory is missing