[feclipse-maven-plugin/eclipse-luna] SCL-ise

Mat Booth mbooth at fedoraproject.org
Thu Jul 17 14:58:45 UTC 2014


commit 52d59ce53b2f25c262e094d3e31ab85c6dc1466e
Author: Mat Booth <mat.booth at redhat.com>
Date:   Thu Jul 17 15:58:45 2014 +0100

    SCL-ise

 feclipse-maven-plugin.spec |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/feclipse-maven-plugin.spec b/feclipse-maven-plugin.spec
index 5e3a69c..f7ec2ef 100644
--- a/feclipse-maven-plugin.spec
+++ b/feclipse-maven-plugin.spec
@@ -1,6 +1,9 @@
-Name:           feclipse-maven-plugin
+%{?scl:%scl_package feclipse-maven-plugin}
+%{!?scl:%global pkg_name %{name}}
+
+Name:           %{?scl_prefix}feclipse-maven-plugin
 Version:        0.0.5
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        Eclipse repo2runnable Maven Mojo
 
 Group:          Development/Libraries
@@ -9,16 +12,16 @@ URL:            http://maven.apache.org
 Source0:        https://git.fedorahosted.org/cgit/feclipse-maven-plugin.git/snapshot/feclipse-maven-plugin-%{version}.tar.xz
 BuildArch:      noarch
 
-BuildRequires: mvn(org.eclipse.tycho:tycho-p2-facade) >= 0.20.0
+BuildRequires: %{?scl_prefix}mvn(org.eclipse.tycho:tycho-p2-facade) >= 0.20.0
 BuildRequires: mvn(org.apache.maven:maven-plugin-api)
 BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(org.eclipse.tycho.extras:tycho-p2-extras-plugin)
+BuildRequires: %{?scl_prefix}mvn(org.eclipse.tycho.extras:tycho-p2-extras-plugin)
 BuildRequires: maven-local
-Requires: mvn(org.eclipse.tycho:tycho-p2-facade)
+Requires: %{?scl_prefix}mvn(org.eclipse.tycho:tycho-p2-facade)
 Requires: mvn(org.apache.maven:maven-plugin-api)
 Requires: mvn(junit:junit)
-Requires: mvn(org.eclipse.tycho.extras:tycho-p2-extras-plugin) >= 0.20.0
-Requires: eclipse-platform
+Requires: %{?scl_prefix}mvn(org.eclipse.tycho.extras:tycho-p2-extras-plugin) >= 0.20.0
+Requires: %{?scl_prefix}eclipse-platform
 
 %description
 A Maven plugin that transform Eclipse P2 repository into a runnable form,
@@ -33,15 +36,19 @@ Requires:       jpackage-utils
 API documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q -n %{pkg_name}-%{version}
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 cd installer
 %mvn_build
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
 cd installer
 %mvn_install
+%{?scl:EOF}
 
 
 %files -f installer/.mfiles
@@ -51,6 +58,9 @@ cd installer
 
 
 %changelog
+* Thu Jul 17 2014 Mat Booth <mat.booth at redhat.com> - 0.0.5-2.1
+- SCL-ise
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list