From f632f3b257ab6c075bac0545bcfd5ac0aac1f797 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Aug 11 2016 12:00:35 +0000 Subject: Don't ship intermediate artifacts - Fix requires of sci package --- diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec index 2d3b740..e4b9559 100644 --- a/eclipse-ptp.spec +++ b/eclipse-ptp.spec @@ -17,7 +17,7 @@ Summary: Eclipse Parallel Tools Platform Name: eclipse-ptp Version: 9.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: EPL URL: http://www.eclipse.org/ptp @@ -185,6 +185,10 @@ Adds resource managers for a number of different systems. %package sci Summary: PTP Scalable Communication Infrastructure (SCI) BuildArch: noarch +# This package has no automatic requires because it genuinely doesn't +# require anything, so need to add a dep on the filesystem for correct +# directory ownership +Requires: eclipse-filesystem %description sci Parallel Tools Platform components that implements the Scalable Communication @@ -259,6 +263,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/o pushd debug/org.eclipse.ptp.debug.sdm export CFLAGS="%{optflags} -fno-strict-overflow" sh BUILD +make clean popd # Put binary in place and make sure bundle is dir-shaped when installed @@ -323,6 +328,10 @@ ln -s %{_libdir}/eclipse/droplets/ptp-sdm/eclipse/plugins/$plugin/os/linux/%{ecl %changelog +* Thu Aug 11 2016 Mat Booth - 9.1.0-3 +- Don't ship intermediate artifacts +- Fix requires of sci package + * Wed Aug 10 2016 Mat Booth - 9.1.0-2 - Install as droplets, auto-generate requires - Merge source package into SDK