[eclipse-oprofile] Use sources provided upstream rather than regenerating them.
Roland Grunberg
rgrunber at fedoraproject.org
Tue Nov 29 20:36:50 UTC 2011
commit 9b6574fc4604c59cefc2383f8f2eaf976ba49080
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Tue Nov 29 15:35:05 2011 -0500
Use sources provided upstream rather than regenerating them.
.gitignore | 1 +
eclipse-oprofile-fetch-src.sh | 26 --------------------------
eclipse-oprofile.spec | 19 +++++++++----------
sources | 2 +-
4 files changed, 11 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 51936bd..5c4ff7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
eclipse-oprofile-fetched-src-0.6.1.tar.bz2
eclipse-oprofile-fetched-src-v0.8.0.tar.bz2
/eclipse-oprofile-fetched-src-v0.9.0.tar.bz2
+/linuxtools-oprofile-parent-0.9.0-src.tar.bz2
diff --git a/eclipse-oprofile.spec b/eclipse-oprofile.spec
index bae5ae7..b7d4628 100644
--- a/eclipse-oprofile.spec
+++ b/eclipse-oprofile.spec
@@ -1,9 +1,7 @@
-%global src_repo_tag v0.9.0
%global eclipse_base %{_libdir}/eclipse
%global install_loc %{_libdir}/eclipse/dropins/oprofile
%global qualifier 201111050234
%global ver_qual 0.3.1.%{qualifier}
-%global oprofile_src_dir eclipse-oprofile-fetched-src-%{src_repo_tag}
# Disable building of debuginfo package; this package has no debug info to be
# extracted.
@@ -18,15 +16,13 @@
Name: eclipse-oprofile
Version: 0.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Eclipse plugin for OProfile integration
Group: Development/Tools
License: EPL
URL: http://www.eclipse.org/linuxtools/projectPages/oprofile/
-## bash %{name}-fetch-src.sh
-Source0: %{name}-fetched-src-%{src_repo_tag}.tar.bz2
-Source1: %{name}-fetch-src.sh
+Source0: http://download.eclipse.org/technology/linuxtools/%{version}-sources/linuxtools-oprofile-parent-%{version}-src.tar.bz2
ExcludeArch: ppc64
@@ -47,7 +43,7 @@ ExclusiveArch: %{ix86} x86_64
Eclipse plugins to integrate OProfile's profiling capabilities with the CDT.
%prep
-%setup -q -n %{oprofile_src_dir}
+%setup -q -n linuxtools-oprofile-parent-%{version}-src
%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile.feature \
@@ -69,11 +65,11 @@ ln -s %{_bindir}/consolehelper \
#install opcontrol wrapper permission files
install -d -m 755 %{buildroot}%{_sysconfdir}/security/console.apps
-install -D -m 644 oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security \
+install -D -m 644 org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security \
%{buildroot}%{_sysconfdir}/security/console.apps/opcontrol
install -d -m 755 %{buildroot}%{_sysconfdir}/pam.d
install -D -m 644 \
- oprofile/org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd \
+ org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd \
%{buildroot}%{_sysconfdir}/pam.d/opcontrol
#remove install/uninstall script (used in update site only)
@@ -83,11 +79,14 @@ rm -f %{corepath}/natives/linux/scripts/uninstall{,-noconsolehelper}.sh
%files
%defattr(-,root,root,-)
%{install_loc}
-%doc oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
+%doc org.eclipse.linuxtools.oprofile.feature/epl-v10.html
%{_sysconfdir}/security/console.apps/opcontrol
%{_sysconfdir}/pam.d/opcontrol
%changelog
+* Tue Nov 29 2011 Roland Grunberg <rgrunber at redhat.com> 0.9.0-2
+- Use sources provided upstream rather than regenerating them.
+
* Mon Nov 28 2011 Roland Grunberg <rgrunber at redhat.com> 0.9.0-1
- Update to 0.9.0.
- Add ExclusiveArch for RHEL.
diff --git a/sources b/sources
index b5013d2..bf73fbe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afe97b57edb0437cd41a13b045ecde14 eclipse-oprofile-fetched-src-v0.9.0.tar.bz2
+6ad21b13bc66f06237a60476594d3ef3 linuxtools-oprofile-parent-0.9.0-src.tar.bz2
More information about the scm-commits
mailing list