diff --git a/.gitignore b/.gitignore index c3acd9a..19e8a1f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /org.eclipse.linuxtools-1.1.1.tar.bz2 /org.eclipse.linuxtools-1.2.0.tar.bz2 /org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2 +/org.eclipse.linuxtools-aa6d235e80a4ce603c872ad4e7cede0692c7e309.tar.bz2 diff --git a/eclipse-linuxtools.spec b/eclipse-linuxtools.spec index fd70bf4..157df4a 100644 --- a/eclipse-linuxtools.spec +++ b/eclipse-linuxtools.spec @@ -1,9 +1,12 @@ +%{?scl:%scl_package eclipse-linuxtools} +%{!?scl:%global pkg_name %{name}} + %global eclipse_dropin %{_datadir}/eclipse/dropins -%global git_version 95aacfe82466cb691f5adf09aae33c361335935b +%global git_version aa6d235e80a4ce603c872ad4e7cede0692c7e309 -Name: eclipse-linuxtools +Name: %{?scl_prefix}eclipse-linuxtools Version: 2.0.0 -Release: 0.1.git95aacfe%{?dist} +Release: 0.2.gitaa6d235%{?dist} Summary: Linux specific Eclipse plugins License: EPL @@ -15,18 +18,18 @@ Patch2: disable-jacoco-maven-plugin.patch BuildRequires: tycho BuildRequires: tycho-extras -BuildRequires: eclipse-cdt -BuildRequires: eclipse-jdt -BuildRequires: swt-chart +BuildRequires: %{?scl_prefix}eclipse-cdt +BuildRequires: %{?scl_prefix}eclipse-jdt +BuildRequires: %{?scl_prefix}swt-chart BuildRequires: maven-clean-plugin BuildRequires: eclipse-swtbot -BuildRequires: eclipse-gef +BuildRequires: %{?scl_prefix}eclipse-gef BuildRequires: osgi(org.eclipse.ptp.remote.core) BuildRequires: exec-maven-plugin BuildArch: noarch -Obsoletes: eclipse-linuxprofilingframework < %{version}-%{release} -Provides: eclipse-linuxprofilingframework = %{version}-%{release} +Obsoletes: %{?scl:%scl_maven_opts}eclipse-linuxprofilingframework < %{version}-%{release} +Provides: %{?scl:%scl_maven_opts}eclipse-linuxprofilingframework = %{version}-%{release} %description The Linux Tools project is a two-faceted project. Firstly, it develops tools @@ -35,36 +38,36 @@ a place for Linux distributions to collaboratively overcome issues surrounding distribution packaging of Eclipse technology. The project will produce both best practices and tools related to packaging. -%package -n eclipse-changelog +%package -n %{?scl_prefix}eclipse-changelog Version: 2.8.1 Summary: Eclipse ChangeLog plug-in Epoch: 2 -%description -n eclipse-changelog +%description -n %{?scl_prefix}eclipse-changelog The Eclipse ChangeLog package contains Eclipse features and plugins that are useful for ChangeLog maintenance within the Eclipse IDE. It includes fragments for parsing C, C++, and Java source files to create more detailed entries containing function or method names. -%package -n eclipse-rpmstubby +%package -n %{?scl_prefix}eclipse-rpmstubby Summary: Rpm spec file generator -%description -n eclipse-rpmstubby +%description -n %{?scl_prefix}eclipse-rpmstubby RPM Stubby Plug-in is a plugin aiming to auto-generate RPM spec files. -%package -n eclipse-rpm-editor +%package -n %{?scl_prefix}eclipse-rpm-editor Summary: RPM Spec file editor for Eclipse Requires: rpmlint >= 0.81 Requires: rpmdevtools -%description -n eclipse-rpm-editor +%description -n %{?scl_prefix}eclipse-rpm-editor The Eclipse Spec file Editor package contains Eclipse plugins that are useful for maintenance of RPM spec files within the Eclipse IDE. -%package -n eclipse-manpage +%package -n %{?scl_prefix}eclipse-manpage Summary: Man page viewer @@ -72,38 +75,38 @@ Summary: Man page viewer Plugin providing common interface for displaying a man page in a view or fetching its content for embedded display purposes (e.g hover help). -%package -n eclipse-gcov +%package -n %{?scl_prefix}eclipse-gcov Summary: GCov Integration -%description -n eclipse-gcov +%description -n %{?scl_prefix}eclipse-gcov Functionality to integrate GCov with the Eclipse workbench. -%package -n eclipse-gprof +%package -n %{?scl_prefix}eclipse-gprof Summary: GProf Integration -%description -n eclipse-gprof +%description -n %{?scl_prefix}eclipse-gprof Functionality to integrate GProf with the Eclipse workbench. -%package -n eclipse-oprofile +%package -n %{?scl_prefix}eclipse-oprofile Summary: Eclipse plugin for OProfile integration Requires: oprofile >= 0.9.3 Requires: usermode >= 1.98 -%description -n eclipse-oprofile +%description -n %{?scl_prefix}eclipse-oprofile Eclipse plugins to integrate OProfile's profiling capabilities with the CDT. -%package -n eclipse-perf +%package -n %{?scl_prefix}eclipse-perf Summary: Eclipse plugin for Perf integration Requires: perf -%description -n eclipse-perf +%description -n %{?scl_prefix}eclipse-perf Eclipse plugins to integrate Perf's profiling capabilities with the CDT. -%package -n eclipse-valgrind +%package -n %{?scl_prefix}eclipse-valgrind Summary: Valgrind Tools Integration for Eclipse Requires: valgrind @@ -112,16 +115,16 @@ Requires: valgrind This package for Eclipse allows users to launch their C/C++ Development Tools projects using the Valgrind tool suite and presents the results in the IDE. -%package -n eclipse-systemtap +%package -n %{?scl_prefix}eclipse-systemtap Summary: Systemtap Tools Integration for Eclipse Requires: systemtap -Obsoletes: eclipse-callgraph < %{version}-%{release} -Obsoletes: eclipse-systemtapgui < 1.2 -Provides: eclipse-callgraph = %{version}-%{release} -Provides: eclipse-systemtapgui = 1.2 +Obsoletes: %{?scl:%scl_maven_opts}eclipse-callgraph < %{version}-%{release} +Obsoletes: %{?scl:%scl_maven_opts}eclipse-systemtapgui < 1.2 +Provides: %{?scl:%scl_maven_opts}eclipse-callgraph = %{version}-%{release} +Provides: %{?scl:%scl_maven_opts}eclipse-systemtapgui = 1.2 -%description -n eclipse-systemtap +%description -n %{?scl_prefix}eclipse-systemtap Integrate Systemtap's profiling and tracing capabilities with the CDT. @@ -136,6 +139,7 @@ Integrate Systemtap's profiling and tracing capabilities with the CDT. %pom_disable_module libhover %build +%{?scl:%scl_maven_opts} mvn-rpmbuild clean install -Dmaven.test.skip=true -DskipTychoVersionCheck=true pushd releng/org.eclipse.linuxtools.releng-site/target/repository/features @@ -231,59 +235,63 @@ popd %doc profiling/org.eclipse.linuxtools.profiling-feature/license.html %doc profiling/org.eclipse.linuxtools.profiling-feature/epl-v10.html -%files -n eclipse-changelog +%files -n %{?scl:%scl_maven_opts}eclipse-changelog %{eclipse_dropin}/changelog %doc changelog/org.eclipse.linuxtools.changelog-feature/license.html %doc changelog/org.eclipse.linuxtools.changelog-feature/epl-v10.html -%files -n eclipse-rpmstubby +%files -n %{?scl:%scl_maven_opts}eclipse-rpmstubby %{eclipse_dropin}/rpmstubby %doc rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/license.html %doc rpmstubby/org.eclipse.linuxtools.rpmstubby-feature/epl-v10.html -%files -n eclipse-rpm-editor +%files -n %{?scl:%scl_maven_opts}eclipse-rpm-editor %{eclipse_dropin}/rpm %doc rpm/org.eclipse.linuxtools.rpm-feature/license.html %doc rpm/org.eclipse.linuxtools.rpm-feature/epl-v10.html -%files -n eclipse-manpage +%files -n %{?scl:%scl_maven_opts}eclipse-manpage %{eclipse_dropin}/man %doc man/org.eclipse.linuxtools.man-feature/license.html %doc man/org.eclipse.linuxtools.man-feature/epl-v10.html -%files -n eclipse-gcov +%files -n %{?scl:%scl_maven_opts}eclipse-gcov %{eclipse_dropin}/gcov %doc gcov/org.eclipse.linuxtools.gcov-feature/license.html %doc gcov/org.eclipse.linuxtools.gcov-feature/epl-v10.html -%files -n eclipse-gprof +%files -n %{?scl:%scl_maven_opts}eclipse-gprof %{eclipse_dropin}/gprof %doc gprof/org.eclipse.linuxtools.gprof-feature/license.html %doc gprof/org.eclipse.linuxtools.gprof-feature/epl-v10.html -%files -n eclipse-oprofile +%files -n %{?scl:%scl_maven_opts}eclipse-oprofile %{eclipse_dropin}/oprofile %attr(755, root, root) %{eclipse_dropin}/oprofile/plugins/org.eclipse.linuxtools.oprofile.core_*/natives/linux/scripts/opcontrol %{_datadir}/polkit-1/actions/org.eclipse.linuxtools.oprofile.policy %doc oprofile/org.eclipse.linuxtools.oprofile-feature/license.html %doc oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html -%files -n eclipse-perf +%files -n %{?scl:%scl_maven_opts}eclipse-perf %{eclipse_dropin}/perf %doc perf/org.eclipse.linuxtools.perf-feature/license.html %doc perf/org.eclipse.linuxtools.perf-feature/epl-v10.html -%files -n eclipse-valgrind +%files -n %{?scl:%scl_maven_opts}eclipse-valgrind %{eclipse_dropin}/valgrind %doc valgrind/org.eclipse.linuxtools.valgrind-feature/license.html %doc valgrind/org.eclipse.linuxtools.valgrind-feature/epl-v10.html -%files -n eclipse-systemtap +%files -n %{?scl:%scl_maven_opts}eclipse-systemtap %{eclipse_dropin}/systemtap %doc systemtap/org.eclipse.linuxtools.systemtap-feature/license.html %doc systemtap/org.eclipse.linuxtools.systemtap-feature/epl-v10.html %changelog +* Wed Apr 10 2013 Alexander Kurtakov 2.8.1-0.2.gitaa6d235 +- SCL-ize. +- Update to newer snapshot. + * Wed Mar 27 2013 Alexander Kurtakov 2.0.0-0.1.git95aacfe - Update to 2.0.0 prerelease for Kepler compatibility. - Changelog no longer has it's own release as the version bumped. diff --git a/sources b/sources index 301219f..392273a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ee56f376e7a4e65f46362cb414739aa org.eclipse.linuxtools-95aacfe82466cb691f5adf09aae33c361335935b.tar.bz2 +72e30fa5977bdd4c3cc2f9cea9aba607 org.eclipse.linuxtools-aa6d235e80a4ce603c872ad4e7cede0692c7e309.tar.bz2