[eclipse-p2-discovery] Update to latest upstream.

[Alexander Kurtakov]

commit 20eb4126268ce60ee35ff411f2ab43552de3ea94
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 12 16:59:22 2011 +0300

    Update to latest upstream.

 .gitignore                        |    1 +
 eclipse-p2-discovery-fetch-src.sh |    8 ++++----
 eclipse-p2-discovery.spec         |   22 ++++++++--------------
 remove-license-feature.patch      |   13 +++++++++++++
 sources                           |    2 +-
 5 files changed, 27 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af0fd52..7c1f6cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /eclipse-p2-discovery-fetched-src-v20100503.tar.xz
+eclipse-p2-discovery-fetched-src-v20110519.tar.xz
diff --git a/eclipse-p2-discovery-fetch-src.sh b/eclipse-p2-discovery-fetch-src.sh
index 99c47f0..a166cbe 100644
--- a/eclipse-p2-discovery-fetch-src.sh
+++ b/eclipse-p2-discovery-fetch-src.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 NAME="eclipse-p2-discovery"
-VERSION="1.0.0"
-TAG="v20100503"
-BUILD="R-3.6-201006080911"
+VERSION="1.0.100"
+TAG="v20110519"
+BUILD="R-3.7-201106131736"
 
 echo "Exporting from CVS..."
 mkdir $NAME-$VERSION-$TAG
@@ -28,4 +28,4 @@ rm $TEMPMAPFILE $MAPFILE
 popd >/dev/null
 
 echo "Creating tarball '$NAME-fetched-src-$TAG.tar.xz'..."
-tar -cJf $NAME-fetched-src-$TAG.tar.xz $NAME-$VERSION-$TAG
\ No newline at end of file
+tar -cJf $NAME-fetched-src-$TAG.tar.xz $NAME-$VERSION-$TAG
diff --git a/eclipse-p2-discovery.spec b/eclipse-p2-discovery.spec
index 71ad92a..de79926 100644
--- a/eclipse-p2-discovery.spec
+++ b/eclipse-p2-discovery.spec
@@ -1,10 +1,10 @@
-%global src_repo_tag   v20100503
+%global src_repo_tag   v20110519
 %global eclipse_base   %{_libdir}/eclipse
 %global install_loc    %{_datadir}/eclipse/dropins/discovery
 
 Name:           eclipse-p2-discovery
-Version:        1.0.0
-Release:        2%{?dist}
+Version:        1.0.100
+Release:        1%{?dist}
 Summary:        Equinox p2 Discovery
 
 Group:          Development/Tools
@@ -12,7 +12,7 @@ License:        EPL
 URL:            http://www.eclipse.org/equinox/p2
 Source0:        %{name}-fetched-src-%{src_repo_tag}.tar.xz
 Source1:        %{name}-fetch-src.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         remove-license-feature.patch
 
 BuildArch: noarch
 
@@ -24,30 +24,24 @@ All of the bundles that comprise the Equinox p2 discovery component.
 
 %prep
 %setup -q -n %{name}-%{version}-%{src_repo_tag}
-
-%{__chmod} a-x org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/epl-v10.html
-%{__chmod} a-x org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/license.html
+%patch0
 
 %build
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.equinox.p2.discovery.feature
 
 %install
-%{__rm} -rf %{buildroot}
 install -d -m 755 %{buildroot}%{install_loc}
 
 %{__unzip} -q -d %{buildroot}%{install_loc} \
      build/rpmBuild/org.eclipse.equinox.p2.discovery.feature.zip 
 
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{install_loc}
-%doc org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/epl-v10.html
-%doc org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/license.html
 
 %changelog
+* Tue Jul 12 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.100-1
+- Update to latest upstream.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/remove-license-feature.patch b/remove-license-feature.patch
new file mode 100644
index 0000000..d5aa011
--- /dev/null
+++ b/remove-license-feature.patch
@@ -0,0 +1,13 @@
+--- org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/feature.xml.sav	2011-01-23 21:08:23.000000000 +0200
++++ org.eclipse.equinox/p2/features/org.eclipse.equinox.p2.discovery.feature/feature.xml	2011-07-12 16:54:00.057950128 +0300
+@@ -3,9 +3,7 @@
+       id="org.eclipse.equinox.p2.discovery.feature"
+       label="%featureName"
+       version="1.0.100.qualifier"
+-      provider-name="%providerName"
+-      license-feature="org.eclipse.license"
+-      license-feature-version="1.0.0.qualifier"> 
++      provider-name="%providerName"> 
+ 
+    <description>
+       %description
diff --git a/sources b/sources
index ced7a88..60565d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fa66288cf603b29479840e5054d9570  eclipse-p2-discovery-fetched-src-v20100503.tar.xz
+cb8368f376bc457da652a648a499d43d  eclipse-p2-discovery-fetched-src-v20110519.tar.xz