From 4b9c419690104e364ef3d954c0efb1c325a6344b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Jun 21 2017 12:53:29 +0000 Subject: Include lib directories for now --- diff --git a/xmvn.spec b/xmvn.spec index 52aaebb..0a1a407 100644 --- a/xmvn.spec +++ b/xmvn.spec @@ -10,7 +10,7 @@ Name: xmvn Version: 3.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Local Extensions for Apache Maven License: ASL 2.0 URL: https://fedora-java.github.io/xmvn/ @@ -42,6 +42,8 @@ BuildRequires: plexus-containers-component-metadata %if %{with gradle} BuildRequires: gradle >= 2.5 %endif +# XXX temp hack to unbreak buildroot +BuildRequires: tycho Requires: %{name}-minimal = %{version}-%{release} Requires: maven >= 3.4.0 @@ -239,7 +241,8 @@ chmod -R +rwX %{name}-%{version}* # These are installed as doc rm -f %{name}-%{version}*/{AUTHORS-XMVN,README-XMVN.md,LICENSE,NOTICE,NOTICE-XMVN} # Not needed - we use JPackage launcher scripts -rm -Rf %{name}-%{version}*/lib/{installer,resolver,subst,bisect}/ +# XXX apparently still needed +#rm -Rf %{name}-%{version}*/lib/{installer,resolver,subst,bisect}/ # Irrelevant Maven launcher scripts rm -f %{name}-%{version}*/bin/{mvn.cmd,mvnDebug.cmd,mvn-script} @@ -301,6 +304,8 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/ %{_datadir}/%{name}/bin/mvnyjp %{_datadir}/%{name}/boot %{_datadir}/%{name}/conf +# XXX +%{_datadir}/%{name}/lib %files parent-pom -f .mfiles-xmvn-parent %doc LICENSE NOTICE @@ -339,6 +344,9 @@ cp -P ${maven_home}/bin/m2.conf %{buildroot}%{_datadir}/%{name}/bin/ %doc LICENSE NOTICE %changelog +* Wed Jun 21 2017 Michael Simacek - 3.0.0-3 +- Include lib directories for now + * Wed Jun 21 2017 Mikolaj Izdebski - 3.0.0-2 - Fix loading of XMvn Installer plugins