[eclipse-changelog] Update to Linux Tools 0.9.0 release. Add rhel flags.

Jeff Johnston jjohnstn at fedoraproject.org
Tue Nov 29 01:24:14 UTC 2011


commit b92f501b09d3838057bca9d9a98eafbca2c964e6
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Mon Nov 28 20:23:39 2011 -0500

    Update to Linux Tools 0.9.0 release.
    Add rhel flags.

 .gitignore             |    1 +
 eclipse-changelog.spec |   30 ++++++++++++++++++++++--------
 sources                |    2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d75e001..1207cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ eclipse-changelog-src-R0_6_0.tar.bz2
 eclipse-changelog-src-R0_6_0
 /eclipse-changelog-src-R0_6_1.tar.bz2
 linuxtools-changelog-0.0.1-src.tar.bz2
+/linuxtools-changelog-parent-0.9.0-src.tar.bz2
diff --git a/eclipse-changelog.spec b/eclipse-changelog.spec
index 37fc065..b812471 100644
--- a/eclipse-changelog.spec
+++ b/eclipse-changelog.spec
@@ -5,7 +5,7 @@ Epoch: 1
 
 Name:           eclipse-changelog
 Version:        2.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse ChangeLog plug-in
 
 Group:          Development/Tools
@@ -18,23 +18,26 @@ Obsoletes:      eclipse-changelog-jdt < %{epoch}:%{version}-%{release}
 Provides:       eclipse-changelog-cdt = %{epoch}:%{version}-%{release}
 Provides:       eclipse-changelog-jdt = %{epoch}:%{version}-%{release}
 
-# Note that 0.0.1 != 2.7.0 but this is an upstream issue
-Source0:        http://download.eclipse.org/technology/linuxtools/0.8.0-sources/linuxtools-changelog-0.0.1-src.tar.bz2
+# Note that 0.9.0 is the linuxtools release, not individual features
+Source0:        http://download.eclipse.org/technology/linuxtools/0.9.0-sources/linuxtools-changelog-parent-0.9.0-src.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# CDT 7 requires at least 3.6
-BuildRequires:          eclipse-pde >= 1:3.6.0
+BuildRequires:          eclipse-pde >= 1:3.7.0
 # CParser requires at least CDT 7.0.0
 BuildRequires:          eclipse-cdt >= 1:7.0.0
 BuildRequires:          java-devel >= 1.4.2
 
 # These plugins are really noarch but they need cdt which
 # we only build on these architectures.
+%if 0%{?rhel} >= 6
+ExclusiveArch: %{ix86} x86_64
+%else
 ExclusiveArch: %{ix86} x86_64 ppc ia64
+%endif
 %define debug_package %{nil}
 
-Requires:               eclipse-platform >= 1:3.6.0
+Requires:               eclipse-platform >= 1:3.7.0
 
 %description
 The Eclipse ChangeLog package contains Eclipse features and plugins that are
@@ -43,7 +46,7 @@ fragments for parsing C, C++, and Java source files to create more detailed
 entries containing function or method names.
 
 %prep
-%setup -q -c -n linuxtools-changelog-0.0.1-src
+%setup -q -c -n linuxtools-changelog-parent-0.9.0-src
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -d cdt \
@@ -59,15 +62,26 @@ install -d -m 755 $installDir
 unzip -q -d $installDir \
  build/rpmBuild/org.eclipse.linuxtools.changelog.zip
 
+%post
+eclipse-reconciler.sh %{_libdir}/eclipse %{_tmppath} > /dev/null
+
+%postun
+eclipse-reconciler.sh %{_libdir}/eclipse %{_tmppath} > /dev/null
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc linuxtools-changelog-0.0.1-src/org.eclipse.linuxtools.changelog-feature/epl-v10.html
+%doc linuxtools-changelog-parent-0.9.0-src/org.eclipse.linuxtools.changelog/epl-v10.html
 %{eclipse_base}/dropins/changelog
 
 %changelog
+* Mon Nov 28 2011 Jeff Johnston <jjohnstn at redhat.com> 1:2.7.0-2
+- Update to Linux Tools 0.9.0 release.
+- Add rhel flags.
+
 * Wed Jul 13 2011 Andrew Overholt <overholt at redhat.com> 1:2.7.0-1
 - Update to Linux Tools 0.8.0 (Indigo) release.
 
diff --git a/sources b/sources
index 657a8a1..a8620fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a80ef2722be90da927924d0903d5ffb  linuxtools-changelog-0.0.1-src.tar.bz2
+64f30ef695ae785b8b823464f40abcc5  linuxtools-changelog-parent-0.9.0-src.tar.bz2


More information about the scm-commits mailing list