[eclipse-shelled/eclipse-luna] SCL-ise

Mat Booth mbooth at fedoraproject.org
Wed Jul 30 16:44:54 UTC 2014


commit 85848b1323e4d87a018a930eebb0d016af6eb2d7
Author: Mat Booth <mat.booth at redhat.com>
Date:   Wed Jul 30 17:44:29 2014 +0100

    SCL-ise

 eclipse-shelled.spec |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/eclipse-shelled.spec b/eclipse-shelled.spec
index bbaada9..6447217 100644
--- a/eclipse-shelled.spec
+++ b/eclipse-shelled.spec
@@ -1,22 +1,25 @@
+%{?scl:%scl_package eclipse-shelled}
+%{!?scl:%global pkg_name %{name}}
+
 %global install_loc      %{_datadir}/eclipse/dropins/shelled
 
 Summary:          Eclipse Shell script editor
-Name:             eclipse-shelled
+Name:             %{?scl_prefix}eclipse-shelled
 #Next release is not planned. Release 133 is checkedout.
 Version:          2.0.3
-Release:          4%{?dist}
+Release:          4.1%{?dist}
 License:          EPL
 URL:              http://sourceforge.net/projects/shelled
 Group:            Development/Tools
 Source0:          http://downloads.sourceforge.net/project/shelled/shelled/ShellEd%20%{version}/shelled-%{version}-src.tar.bz2
-Requires:         eclipse-platform >= 1:4.2.0
-Requires:         eclipse-dltk >= 4.0.0
-Requires:         eclipse-manpage
-BuildRequires:    eclipse-pde
-BuildRequires:    eclipse-dltk
-BuildRequires:    eclipse-manpage
-BuildRequires:    tycho
-BuildRequires:    feclipse-maven-plugin
+Requires:         %{?scl_prefix}eclipse-platform >= 1:4.2.0
+Requires:         %{?scl_prefix}eclipse-dltk >= 4.0.0
+Requires:         %{?scl_prefix}eclipse-manpage
+BuildRequires:    %{?scl_prefix}eclipse-pde
+BuildRequires:    %{?scl_prefix}eclipse-dltk
+BuildRequires:    %{?scl_prefix}eclipse-manpage
+BuildRequires:    %{?scl_prefix}tycho
+BuildRequires:    %{?scl_prefix}feclipse-maven-plugin
 BuildRequires:    java-devel >= 0:1.7
 BuildArch:        noarch
 
@@ -32,16 +35,23 @@ sed -i -e "s/net.sourceforge.shelled-feature/net.sourceforge.shelled/g" pom.xml
 %pom_xpath_remove pom:build/pom:extensions
 
 %build
+%{?scl:scl enable %{scl} - << "EOF"}
 # build the main shelled feature
 xmvn -o clean verify -Dmaven.test.skip=true
+%{?scl:EOF}
 
 %install
+%{?scl:scl enable %{scl} - << "EOF"}
 xmvn -o org.fedoraproject:feclipse-maven-plugin:install -DsourceRepo=net.sourceforge.shelled-site/target/repository -DtargetLocation=%{buildroot}%{install_loc}
-            
+%{?scl:EOF}
+
 %files
 %{install_loc}
 
 %changelog
+* Wed Jul 30 2014 Mat Booth <mat.booth at redhat.com> - 2.0.3-4.1
+- SCL-ise
+
 * Mon Jun 9 2014 Alexander Kurtakov <akurtako at redhat.com> 2.0.3-4
 - Fix FTBFS.
 


More information about the scm-commits mailing list