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

Fix p2 subpackage installation

Browse Source
This commit is contained in:
Mikolaj Izdebski 2014-06-26 10:51:06 +02:00
parent b5697acdd0
commit ef878f46e5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xmvn.spec
View File

@ -147,6 +147,10 @@ This package provides %{summary}.
%prep %prep
%setup -q %setup -q
# TODO: move this to javapackages-tools
%mvn_package ::xml:p2metadata: __noinstall
%mvn_package ::xml:p2artifacts: __noinstall
%mvn_package :xmvn __noinstall %mvn_package :xmvn __noinstall
%mvn_package :*p2* p2 %mvn_package :*p2* p2
@ -171,7 +175,7 @@ sed -i 's|generated-site/resources/xsd/config|generated-site/xsd/config|' xmvn-c
%build %build
# XXX some tests fail on ARM for unknown reason, see why # XXX some tests fail on ARM for unknown reason, see why
%mvn_build -s -f -X %mvn_build -s -f
tar --delay-directory-restore -xvf target/*tar.bz2 tar --delay-directory-restore -xvf target/*tar.bz2
chmod -R +rwX %{name}-%{version}* chmod -R +rwX %{name}-%{version}*
@ -216,9 +220,9 @@ EOF
cp -P %{_datadir}/maven/conf/settings.xml %{buildroot}%{_datadir}/%{name}/conf/ cp -P %{_datadir}/maven/conf/settings.xml %{buildroot}%{_datadir}/%{name}/conf/
# TODO: Move this upstream # TODO: Move this upstream
ln -s %{_javadir}/eclipse/osgi.jar %{buildroot}%{_datadir}/%{name}/lib/installer ln -s %{_javadir}/eclipse/osgi.jar %{buildroot}%{_datadir}/%{name}/lib/installer/
ln -s %{_javadir}/%{name}/xmvn-p2-installer-plugin.jar %{buildroot}%{_datadir}/%{name}/lib/installer ln -s %{_javadir}/%{name}/xmvn-p2-installer-plugin.jar %{buildroot}%{_datadir}/%{name}/lib/installer/
ln -s %{_javadir}/%{name}/org.fedoraproject.xmvn.p2.jar %{buildroot}%{_datadir}/%{name}/lib/installer ln -s %{_javadir}/%{name}/org.fedoraproject.xmvn.p2.jar %{buildroot}%{_datadir}/%{name}/lib/installer/
%pretrans -p <lua> %pretrans -p <lua>
-- we changed symlink to dir in 0.5.0-1, workaround RPM issues -- we changed symlink to dir in 0.5.0-1, workaround RPM issues
@ -294,13 +298,14 @@ end
%dir %{_datadir}/%{name}/lib %dir %{_datadir}/%{name}/lib
%{_datadir}/%{name}/bin/%{name}-install %{_datadir}/%{name}/bin/%{name}-install
%{_datadir}/%{name}/lib/installer %{_datadir}/%{name}/lib/installer
%exclude %{_datadir}/%{name}/lib/installer/orgi.jar %exclude %{_datadir}/%{name}/lib/installer/osgi.jar
%exclude %{_datadir}/%{name}/lib/installer/xmvn-p2-installer-plugin.jar %exclude %{_datadir}/%{name}/lib/installer/xmvn-p2-installer-plugin.jar
%exclude %{_datadir}/%{name}/lib/installer/org.fedoraproject.xmvn.p2.jar %exclude %{_datadir}/%{name}/lib/installer/org.fedoraproject.xmvn.p2.jar
%files p2 -f .mfiles-p2 %files p2 -f .mfiles-p2
%{_datadir}/%{name}/lib/installer/orgi.jar %{_datadir}/%{name}/lib/installer/osgi.jar
%{_datadir}/%{name}/lib/installer/xmvn-p2-installer-plugin.jar %{_datadir}/%{name}/lib/installer/xmvn-p2-installer-plugin.jar
%{_datadir}/%{name}/lib/installer/org.fedoraproject.xmvn.p2.jar
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%doc LICENSE NOTICE %doc LICENSE NOTICE