[eclipse-mercurial/f15] updated release7-after feature was added to the upstream

[Minoo Ziaei]

commit 28fd0fa5d6eeaebb495d569a7097cb6fe473d318
Author: Minoo Ziaei <mziaei at redhat.com>
Date:   Mon Jun 27 12:19:14 2011 -0400

    updated release7-after feature was added to the upstream

 eclipse-mercurial.spec           |   32 +++++++++++++++++---------------
 get-eclipse-mercurial-sources.sh |   38 ++++++++++++++++----------------------
 sources                          |    2 +-
 3 files changed, 34 insertions(+), 38 deletions(-)
---
diff --git a/eclipse-mercurial.spec b/eclipse-mercurial.spec
index a9a20b4..5af815a 100644
--- a/eclipse-mercurial.spec
+++ b/eclipse-mercurial.spec
@@ -4,25 +4,23 @@
 %global qualifier       v201104191217
 
 Name:           eclipse-mercurial
-Version:        1.8.1
-Release:        6%{?dist}
+Version:        1.8
+Release:        7%{?dist}
 Summary:        Eclipse Mercurial plugin
 License:        EPL
 URL:            http://javaforge.com/project/HGE
 Group:          Development/Tools
 
-# Tar file generated from Mercurial repository (tag 1.8.1)
+# Tar file generated from Mercurial repository (branch maintenance_1_8)
 # by:
-#   bash get-eclipse-mercurial-sources.sh 1.8.1
-# retrieved the plug-in from http://www.javaforge.com/project/HGE, RELEASE_1.8.1
-# At the moment upstream does not have a feature project in their repository. 
-# Therefore we did the following steps in the script to get the corresponding feature:
-#   -retrieved the feature from: 
-#      https://hg.codespot.com/a/eclipselabs.org/mercurialeclipse.wiki
-#   -changed the version from 1.9.0 to 1.8.1
-# Once the issue#17846: http://www.javaforge.com/issue/17846?orgDitchnetTabPaneId=task-details-comments
-# is resoloved, we can remove this.
-Source0:        eclipse-mercurial-1.8.1.tar.bz2
+#   bash get-eclipse-mercurial-sources.sh 
+# retrieved the plug-in from http://javaforge.com:8000/hgeclipse -u maintenance_1_8
+# Since the feature is recently added to the already release version(1.8.1), 
+# it's being maintained in branch maintenance_1_8
+# Once the next version is released(1.9.0), 
+# the related tag will be used to archive.
+# So, RELEASE_1.8.1 tag was not used in this version
+Source0:        eclipse-mercurial-1.8.tar.bz2
 Source1:        get-eclipse-mercurial-sources.sh
 
 BuildRequires:  java-devel >= 1:1.6.0
@@ -57,11 +55,15 @@ unzip -q -d %{buildroot}%{install_loc}/ \
 
 %files
 %{install_loc}
-%doc mercurial/LICENSE
+%doc LICENSE
 
 %changelog
+* Mon Jun 27 2011 mziaei <mziaei at redhat.com> 1.8.1-7
+- Added the 1.8.2 feature from upstream (recently added to branch maintenance_1_8)
+- Changed the version to 1.8 to avoid conflicts
+
 * Mon Jun 20 2011 Minoo Ziaei <mziaei at redhat.com> 1.8.1-6
-- Added the upstream feature 
+- Added the maintainer feature from hgwiki
 
 * Thu Jun 16 2011 Minoo Ziaei <mziaei at redhat.com> 1.8.1-5
 - removed epl, fixed the feature version
diff --git a/get-eclipse-mercurial-sources.sh b/get-eclipse-mercurial-sources.sh
index ec066f3..b69eee2 100644
--- a/get-eclipse-mercurial-sources.sh
+++ b/get-eclipse-mercurial-sources.sh
@@ -1,27 +1,21 @@
 #!/bin/bash
 
-RELEASE="1.8.1"
+RELEASE="1.8"
 
-# Cloning the plug-in
-hg clone http://javaforge.com:8000/hgeclipse && \
-pushd hgeclipse > /dev/null && \
-hg archive -r RELEASE_${RELEASE} eclipse-mercurial-${RELEASE}/mercurial && \
-mv eclipse-mercurial-${RELEASE} ../ && \
-popd > /dev/null && \
-pushd eclipse-mercurial-${RELEASE} > /dev/null 
- 
-# Cloning the feature
-mkdir -p eclipse-mercurial-feature
-hg clone https://hg.codespot.com/a/eclipselabs.org/mercurialeclipse.wiki/
-mv mercurialeclipse.wiki/update_site/MercurialEclipseFeature/*\
-  eclipse-mercurial-feature/ && \
-rm -rf mercurialeclipse.wiki && \
-pushd  eclipse-mercurial-feature > /dev/null && \
-sed 's/1.9.0/1.8.1/' feature.xml >  feature.new.xml && \
-mv feature.new.xml feature.xml 
-popd > /dev/null && popd > /dev/null && \
-
-# Creating the source tar ball
+# cloning the plugin and feature for already released version:1.8.1
+# The feature is recently added to this release 
+# but to the branch maintenance_1_8
+# So, for releases before 1.9.x we use clone of this particular branch
+hg clone http://javaforge.com:8000/hgeclipse -u maintenance_1_8 && \
+mv hgeclipse eclipse-mercurial-${RELEASE} && \
 tar cjf eclipse-mercurial-${RELEASE}.tar.bz2 eclipse-mercurial-${RELEASE} 
-rm -rf hgeclipse && rm -rf eclipse-mercurial-${RELEASE}\
+rm -rf eclipse-mercurial-${RELEASE}\
 
+## once the upstream release is changed to 1.9.x, process will change to:
+#hg clone http://javaforge.com:8000/hgeclipse
+#pushd hgeclipse > /dev/null && \
+#hg archive -r RELEASE_${RELEASE} eclipse-mercurial-${RELEASE} && \
+#mv eclipse-mercurial-${RELEASE} ../ && \
+#popd > /dev/null && \
+#tar cjf eclipse-mercurial-${RELEASE}.tar.bz2 eclipse-mercurial-${RELEASE} 
+#rm -rf hgeclipse eclipse-mercurial-${RELEASE}\
diff --git a/sources b/sources
index 2d4dae8..d73e9bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fbcf2aff74df54ab0797aea826d9d2e  eclipse-mercurial-1.8.1.tar.bz2
+54ce1507a8a029d6ba7aaab95fb3f7f0  eclipse-mercurial-1.8.tar.bz2