[eclipse-oprofile] - Fixes RHBZ#716060. - Rebase to 0.8.0 release (opxml native binaries are now removed).

Sat Jun 25 21:38:36 UTC 2011

commit 7a20724dbcbf36d18b0a21d69c195f3e40356ca7
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Sat Jun 25 17:38:42 2011 -0400

    - Fixes RHBZ#716060.
    - Rebase to 0.8.0 release (opxml native binaries are now removed).

 .gitignore                    |    1 +
 eclipse-oprofile-fetch-src.sh |   26 ++++++++------
 eclipse-oprofile.spec         |   72 +++++++++++-----------------------------
 sources                       |    2 +-
 4 files changed, 37 insertions(+), 64 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2b95d0c..08793d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 eclipse-oprofile-fetched-src-0.6.1.tar.bz2
+eclipse-oprofile-fetched-src-v0.8.0.tar.bz2
diff --git a/eclipse-oprofile-fetch-src.sh b/eclipse-oprofile-fetch-src.sh
index b36694e..c05bed6 100644
--- a/eclipse-oprofile-fetch-src.sh
+++ b/eclipse-oprofile-fetch-src.sh
@@ -1,22 +1,26 @@
 #!/bin/sh
 usage='usage: $0 <tag>'
 name=eclipse-oprofile
-tag=R0_6_1
-tar_name=$name-fetched-src-0.6.1
-
-fetch_cmd="svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/oprofile/tags/$tag/ $tar_name"
+tag="v0.8.0"
+tar_name=$name-fetched-src-$tag
 
 if [ "x$tag"x = 'xx' ]; then
    echo >&2 "$usage"
    exit 1
 fi
 
-rm -fr $tar_name 
+rm -fr $tar_name.tar.bz2 
 
-# Fetch plugins
-$fetch_cmd
+rm -rf org.eclipse.linuxtools
+# Clone linuxtools
+git clone git://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git
+pushd org.eclipse.linuxtools > /dev/null
+# create archive of oprofile subtree
+git archive --format=tar --prefix=$tar_name/ --output ../$tar_name.tar refs/tags/$tag oprofile
+popd > /dev/null
+# clean-up
+rm -rf org.eclipse.linuxtools
+# compress
+bzip2 $tar_name.tar
 
-# create archive
-pushd $tar_name
-tar -cjf ../$tar_name.tar.bz2 *
-popd
+exit 0
diff --git a/eclipse-oprofile.spec b/eclipse-oprofile.spec
index 47a0fb3..581478b 100644
--- a/eclipse-oprofile.spec
+++ b/eclipse-oprofile.spec
@@ -1,8 +1,9 @@
-%define src_repo_tag   0.6.1
-%define eclipse_base   %{_libdir}/eclipse
-%define install_loc    %{_libdir}/eclipse/dropins/oprofile
-%define qualifier      201010081108
-%define ver_qual       0.3.0.%{qualifier}
+%global src_repo_tag   v0.8.0
+%global eclipse_base   %{_libdir}/eclipse
+%global install_loc    %{_libdir}/eclipse/dropins/oprofile
+%global qualifier      201106060936
+%global ver_qual       0.3.1.%{qualifier}
+%global oprofile_src_dir eclipse-oprofile-fetched-src-%{src_repo_tag}
 
 # All arches line up between Eclipse and Linux kernel names except i386 -> x86
 %ifarch %{ix86}
@@ -11,35 +12,23 @@
 %define eclipse_arch   %{_arch}
 %endif
 
-
 Name:           eclipse-oprofile
-Version:        0.6.1
-Release:        4%{?dist}
+Version:        0.8.0
+Release:        1%{?dist}
 Summary:        Eclipse plugin for OProfile integration
 
 Group:          Development/Tools
 License:        EPL
 URL:            http://www.eclipse.org/linuxtools/projectPages/oprofile/
-## sh %{name}-fetch-src.sh
+## bash %{name}-fetch-src.sh
 Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.bz2
 Source1:        %{name}-fetch-src.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExcludeArch: ppc64
 
 BuildRequires: eclipse-pde >= 1:3.5.0
 BuildRequires: eclipse-cdt >= 6.0.0
 BuildRequires: eclipse-linuxprofilingframework >= 0.1.0
-BuildRequires: oprofile >= 0.9.3
-# TODO: remove once we don't require opxml anymore. FYI: oprofile 0.7.x has it
-# removed.
-# Since 0.9.6-19 oprofile-devel provides oprofile-static.
-BuildRequires: oprofile-devel >= 0.9.6-19
-BuildRequires: binutils-devel >= 2.18.50.0.6
-# binutils-static is provided by binutils-devel
-BuildRequires: binutils-static >= 2.18.50.0.6
-# oprofile-static is provided by oprofile-devel since 0.9.6-19
-BuildRequires: oprofile-static >= 0.9.6-19
 Requires: eclipse-platform >= 3.5.0
 Requires: eclipse-cdt >= 6.0.0
 Requires: eclipse-linuxprofilingframework >= 0.2.0
@@ -50,33 +39,21 @@ Requires: usermode >= 1.98
 Eclipse plugins to integrate OProfile's profiling capabilities with the CDT.
 
 %prep
-%setup -q -c
-#remove binaries
-rm -f org.eclipse.linuxtools.oprofile.core.linux.*/os/linux/*/opxml
+%setup -q -n %{oprofile_src_dir}
 
 %build
-#build binaries
-cd org.eclipse.linuxtools.oprofile.core/natives/linux/opxml
-make "CFLAGS=$RPM_OPT_FLAGS"
-
-mv opxml \
-  %{_builddir}/%{name}-%{version}/org.eclipse.linuxtools.oprofile.core.linux.%{eclipse_arch}/os/linux/%{eclipse_arch}
-
-cd %{_builddir}/%{name}-%{version}
-
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.linuxtools.oprofile \
 				      -d "cdt linuxprofilingframework" \
                                       -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -Dosgi.arch=%{eclipse_arch} -Dconfigs=linux,gtk,%{eclipse_arch}"
 
 %install
-%{__rm} -rf %{buildroot}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
      build/rpmBuild/org.eclipse.linuxtools.oprofile.zip 
 
 ### install.sh stuff ###
-%define corepath %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_%{ver_qual}
+%global corepath %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core_%{ver_qual}
 
 #create opcontrol wrapper
 ln -s %{_bindir}/consolehelper \
@@ -84,38 +61,29 @@ ln -s %{_bindir}/consolehelper \
 
 #install opcontrol wrapper permission files
 install -d -m 755 %{buildroot}%{_sysconfdir}/security/console.apps
-install -D -m 644 \
-  org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.security \
+install -D -m 644 oprofile/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 \
-  org.eclipse.linuxtools.oprofile.core/natives/linux/scripts/opcontrol-wrapper.pamd \
+  oprofile/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)
-rm -f %{corepath}/natives/linux/scripts/install.sh
-rm -f %{corepath}/natives/linux/scripts/uninstall.sh
-
-#remove opxml source (rpmlint warnings)
-rm -rf %{corepath}/natives/linux/opxml
-rm -f %{corepath}/natives/linux/scripts/.svnignore
-
-#+x opxml
-chmod +x \
-  %{buildroot}%{install_loc}/eclipse/plugins/org.eclipse.linuxtools.oprofile.core.linux.%{eclipse_arch}_%{ver_qual}/os/linux/%{eclipse_arch}/opxml
-
-
-%clean
-%{__rm} -rf %{buildroot}
+rm -f %{corepath}/natives/linux/scripts/install{,-noconsolehelper}.sh
+rm -f %{corepath}/natives/linux/scripts/uninstall{,-noconsolehelper}.sh
 
 %files
 %defattr(-,root,root,-)
 %{install_loc}
-%doc org.eclipse.linuxtools.oprofile-feature/epl-v10.html
+%doc oprofile/org.eclipse.linuxtools.oprofile-feature/epl-v10.html
 %{_sysconfdir}/security/console.apps/opcontrol
 %{_sysconfdir}/pam.d/opcontrol
 
 %changelog
+* Sat Jun 25 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.8.0-1
+- Fixes RHBZ#716060.
+- Rebase to 0.8.0 release (opxml native binaries are now removed).
+
 * Thu Apr 7 2011 Severin Gehwolf <sgehwolf at redhat.com> 0.6.1-4
 - Clean up the mess I've just created :(
 - Re-add binutils-static BR
diff --git a/sources b/sources
index cc397a8..2d04c41 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e984e5b8bf81fc57e9d0ec3884f2a32b  eclipse-oprofile-fetched-src-0.6.1.tar.bz2
+cad080b6c3755844e9fc31f4500f33dd  eclipse-oprofile-fetched-src-v0.8.0.tar.bz2
