[swt-chart/eclipse-luna] SCL-ise

Mat Booth mbooth at fedoraproject.org
Thu Aug 14 15:09:41 UTC 2014


commit 88531ab31fb8172599651721b61387480d62fcca
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Aug 14 15:54:46 2014 +0100

    SCL-ise

 swt-chart.spec |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)
---
diff --git a/swt-chart.spec b/swt-chart.spec
index cb68ff2..dc3737c 100644
--- a/swt-chart.spec
+++ b/swt-chart.spec
@@ -1,6 +1,9 @@
-Name:           swt-chart
+%{?scl:%scl_package swt-chart}
+%{!?scl:%global pkg_name %{name}}
+
+Name:           %{?scl_prefix}swt-chart
 Version:        0.9.0
-Release:        3%{?dist}
+Release:        3.1%{?dist}
 Summary:        SWTChart Feature
 
 Group:          Development/Tools
@@ -9,16 +12,16 @@ URL:            http://www.swtchart.org/
 # svn export https://swt-chart.svn.sourceforge.net/svnroot/swt-chart/tags/%%{version}/ %%{name}-%%{version}
 # pushd %%{name}-%%{version} && rm -rf org.swtchart.{examples{,.ext},ext} && popd
 # tar -cJf %%{name}-%%{version}.tar.xz %%{name}-%%{version}
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{pkg_name}-%{version}.tar.xz
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
-BuildRequires:  tycho >= 0.14.0
+BuildRequires:  %{?scl_prefix}tycho >= 0.14.0
 
 Requires:       java-headless >= 1.5
 Requires:       jpackage-utils
-Requires:       eclipse-platform >= 3.4.0
+Requires:       %{?scl_prefix}eclipse-platform >= 3.4.0
 
 %description
 SWTChart is a light-weight charting component for SWT.
@@ -31,25 +34,36 @@ Group:          Documentation
 %{summary}.
 
 %prep
-%setup -q
+%setup -q -n %{pkg_name}-%{version}
+%{?scl:scl enable %{scl} - << "EOF"}
 # Create the poms
 xmvn -o org.eclipse.tycho:tycho-pomgenerator-plugin:generate-poms -DgroupId=org.swtchart
 
 # Symlink in %%{_javadir}
-%mvn_file org.swtchart:org.swtchart %{name}/org.swtchart %{name}
+%mvn_file org.swtchart:org.swtchart %{pkg_name}/org.swtchart %{pkg_name}
+%{?scl:EOF}
 
 %build
-%mvn_build
+%{?scl:scl enable %{scl} - << "EOF"}
+xmvn -o verify org.apache.maven.plugins:maven-javadoc-plugin:aggregate
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
+%mvn_artifact pom.xml
+%mvn_artifact org.swtchart/pom.xml org.swtchart/target/org.swtchart-%{version}-SNAPSHOT.jar
 %mvn_install
+%{?scl:EOF}
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
+%dir %{_javadir}/%{pkg_name}
 
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Thu Aug 14 2014 Mat Booth <mat.booth at redhat.com> - 0.9.0-3.1
+- SCL-ise
+
 * Thu Aug 14 2014 Mat Booth <mat.booth at redhat.com> - 0.9.0-3
 - Fix unowned directory
 


More information about the scm-commits mailing list