[eclipse/f17] Update to 4.2 M7

Krzysztof Daniel kdaniel at fedoraproject.org
Sat May 5 17:55:36 UTC 2012


commit 750752c3675a1a45272bec49eb57aeff76c26475
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Sat May 5 19:55:24 2012 +0200

    Update to 4.2 M7
    
    Conflicts:
    	.gitignore

 .gitignore   |    4 +++-
 eclipse.spec |    9 ++++++---
 sources      |    4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e5c51a..cee729a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz
 eclipse-3.8.0-I20120314-1800-src.tar.bz2
 eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
 eclipse-4.2.0-I20120405-1114-src.tar.bz2
-eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
\ No newline at end of file
+eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
+/.project
+
diff --git a/eclipse.spec b/eclipse.spec
index 88f84d6..ccae81c 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,8 +6,8 @@ Epoch:  1
 %global eclipse_micro   0
 %global initialize      1
 %global download_url    http://download.eclipse.org/technology/linuxtools/eclipse-build/4.2.x/
-%global eb_sha1         ba3debca7d1ac4d2d93964c7a7d9b17dcedde65f
-%global build_id        I20120429-1800
+%global eb_sha1         d747eda66dae13c133f56952466ff0ca30da99bf
+%global build_id        I20120503-1800
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global emf_version     2.8.0
 
@@ -20,7 +20,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_version}
-Release:        0.19.I201204291800%{?dist}
+Release:        0.20.I201205031800%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -665,6 +665,9 @@ rm -rf %{_bindir}/efj/
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Sat May 5 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.20.I201205031800
+- Update to M7.
+
 * Mon Apr 30 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-0.19.I201204291800
 - Update to I20120429-1800.
 
diff --git a/sources b/sources
index 5c1c268..9b381bf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4e5c3cb677607e97fa052502b0f49cb3  eclipse-build-ba3debca7d1ac4d2d93964c7a7d9b17dcedde65f.tar.xz
-bb78c435635f0a91a21ad578a3c53bfb  eclipse-4.2.0-I20120429-1800-src.tar.bz2
+3a0a246297515b6dbce78dbdb81b30be  eclipse-4.2.0-I20120503-1800-src.tar.bz2
+105cbd5f034ad980a8d4e66ad0057ff3  eclipse-build-d747eda66dae13c133f56952466ff0ca30da99bf.tar.xz


More information about the scm-commits mailing list