[eclipse-wtp-common] Update to latest upstream revision.

Krzysztof Daniel kdaniel at fedoraproject.org
Wed Apr 25 14:55:02 UTC 2012 

commit a9e5d127c73ba886f550bb234c64119a44854315
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Apr 25 16:54:24 2012 +0200

    Update to latest upstream revision.

 .gitignore                 |    3 ++
 eclipse-wtp-common.spec    |   84 +++++++++++++++++++++----------------------
 fetch-wtp-common-source.sh |    8 ++--
 sources                    |    1 -
 4 files changed, 48 insertions(+), 48 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ce665b..3cc49cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 eclipse-wtp-common-R3_2_4-fetched-src.tar.bz2
 eclipse-wtp-common-R3_3_0-fetched-src.tar.bz2
 eclipse-wtp-common-R3_3_1-fetched-src.tar.bz2
+/eclipse-wtp-common-HEAD
+/noarch
+/eclipse-wtp-common-3.4.0-0.1.20120425cvs.fc18.src.rpm
diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
index 32e96c7..99700d7 100644
--- a/eclipse-wtp-common.spec
+++ b/eclipse-wtp-common.spec
@@ -1,29 +1,28 @@
-%global eclipse_base		%{_libdir}/eclipse
 %global install_loc			%{_datadir}/eclipse/dropins
 
 Name:			eclipse-wtp-common
-Version:		3.3.1
-Release:		3%{?dist}
+Version:		3.4.0
+Release:		0.1.20120425cvs%{?dist}
 Summary:		Common infrastructure and utilities developed and used with WTP
 
 License:		EPL
 URL:			http://www.eclipse.org/webtools/common/
-Source0:		eclipse-wtp-common-R3_3_1-fetched-src.tar.bz2
+Source0:		eclipse-wtp-common-HEAD-fetched-src.tar.bz2
 Source1:		fetch-wtp-common-source.sh
 
 BuildArch:		noarch
 
-BuildRequires:	java-devel >= 1.5.0
-BuildRequires:	eclipse-pde >= 1:3.7.1-10
-BuildRequires:	eclipse-platform >= 1:3.7.1-10
-BuildRequires:	eclipse-jdt >= 1:3.7.1-10
-BuildRequires:	eclipse-emf-xsd >= 2.6.0
-BuildRequires:	eclipse-gef >= 3.6.2
+BuildRequires:	java-devel >= 1.7.0
+BuildRequires:	eclipse-pde >= 4.2.0-0.10
+BuildRequires:	eclipse-platform >= 4.2.0-0.10
+BuildRequires:	eclipse-jdt >= 4.2.0-0.10
+BuildRequires:	eclipse-emf-xsd >= 2.8.0
+BuildRequires:	eclipse-gef >= 3.7.0
 BuildRequires:	eclipse-dtp >= 1.8.2
-Requires:		eclipse-platform >= 1:3.6.2
-Requires:		eclipse-jdt >= 1:3.6.2
-Requires:		eclipse-emf-xsd >= 2.6.0
-Requires:		eclipse-gef >= 3.6.2
+Requires:		eclipse-platform >= 4.2.0-0.10
+Requires:		eclipse-jdt >= 4.2.0-10
+Requires:		eclipse-emf-xsd >= 2.8.0
+Requires:		eclipse-gef >= 3.8.0
 Requires:		eclipse-dtp >= 1.8.2
 
 %description
@@ -32,56 +31,55 @@ the eclipse web tools platform including facets, snippets view, validation and
 extensible URI resolver.
 
 %prep
-%setup -q
+%setup -q -n eclipse-wtp-common-HEAD
 
 %build
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.common.fproj \
-	-d "emf gef"
+OPTIONS="-DforceContextQualifier=201109301723 -DjavacSource=1.5 -DjavacTarget=1.5"
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.jst.common.fproj.enablement.jdt \
-	-d "emf gef"
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.common_core.feature \
-	-d "emf gef"
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.server_core.feature \
-	-d "emf gef"
+eclipse-pdebuild -f org.eclipse.wst.common.fproj \
+	-d "emf gef" -a "${OPTIONS}"
 
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.wst.common_ui.feature \
-	-d "emf gef"
+eclipse-pdebuild -f org.eclipse.jst.common.fproj.enablement.jdt \
+	-d "emf gef" -a "$OPTIONS"
+
+eclipse-pdebuild -f org.eclipse.wst.common_core.feature \
+	-d "emf gef" -a "$OPTIONS"
+
+eclipse-pdebuild -f org.eclipse.wst.server_core.feature \
+	-d "emf gef" -a "$OPTIONS"
+
+eclipse-pdebuild -f org.eclipse.wst.common_ui.feature \
+	-d "emf gef" -a "$OPTIONS"
 
 %install
-install -d -m 755 %{buildroot}%{_datadir}/eclipse
-install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.wst.common.fproj
-install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.jst.common.fproj.enablement.jdt
-install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.wst.common_core.feature
-install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.wst.server_core.feature
-install -d -m 755 %{buildroot}%{install_loc}/org.eclipse.wst.common_ui.feature
-
-unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.common.fproj \
+install -d -m 755 %{buildroot}%{install_loc}/%{name}
+
+unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
  build/rpmBuild/org.eclipse.wst.common.fproj.zip
 
-unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.jst.common.fproj.enablement.jdt \
+unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
  build/rpmBuild/org.eclipse.jst.common.fproj.enablement.jdt.zip
 
-unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.common_core.feature \
+unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
  build/rpmBuild/org.eclipse.wst.common_core.feature.zip
 
-unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.server_core.feature \
+unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
  build/rpmBuild/org.eclipse.wst.server_core.feature.zip
 
-unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.common_ui.feature \
+unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
  build/rpmBuild/org.eclipse.wst.common_ui.feature.zip
 
 
 %files
-%{install_loc}/org.eclipse.wst.common.fproj
-%{install_loc}/org.eclipse.jst.common.fproj.enablement.jdt
-%{install_loc}/org.eclipse.wst.common_core.feature
-%{install_loc}/org.eclipse.wst.server_core.feature
-%{install_loc}/org.eclipse.wst.common_ui.feature
+%{install_loc}/%{name}
+
 
 %changelog
+* Wed Apr 25 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.4.0-0.1.20120425cvs
+- Update to latest upstream revision (3.4.0 post M6)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -95,4 +93,4 @@ unzip -q -o -d %{buildroot}%{install_loc}/org.eclipse.wst.common_ui.feature \
 - Update to WTP-common 3.3.0 release
 
 * Fri Jun 10 2011 Andrew Robinson <arobinso at redhat.com> 3.2.4-1
-- Initial Fedora package
\ No newline at end of file
+- Initial Fedora package
diff --git a/fetch-wtp-common-source.sh b/fetch-wtp-common-source.sh
index 8a8f8b3..372fdb6 100755
--- a/fetch-wtp-common-source.sh
+++ b/fetch-wtp-common-source.sh
@@ -2,10 +2,10 @@
 #
 # eclipse-wtp-common SRPM produces one binary RPM including
 # the wtp common libraries
-# 
-RELEASE_TAG="R3_3_1"
-DOT_TAG="3.3.1"
-LEGACY_TAG="R3_3_0"
+#
+RELEASE_TAG="HEAD"
+DOT_TAG="HEAD"
+LEGACY_TAG="HEAD"
 
 rm -fr common
 # get sources from wtp-common repo
diff --git a/sources b/sources
index 9bae359..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-b7c65cda3a714911e924c5486b1972e2  eclipse-wtp-common-R3_3_1-fetched-src.tar.bz2

More information about the scm-commits mailing list