Attachment 711264 Details for Bug 922452 – git format-patch - fix mentioned issues

[patch] git format-patch - fix mentioned issues

0001-Update-to-upstream-other-improvements.patch (text/plain), 6.36 KB, created by Gerard Ryan on 2013-03-17 02:16:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2013-03-17 02:16:59 UTC

Size: 6.36 KB

patch

obsolete

>From 3ccb6abaa1e117fccd989a33274cf213e2b02c1b Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Sun, 17 Mar 2013 02:01:55 +0000
>Subject: [PATCH] Update to upstream; other improvements
>
>- Fetch tarballs from git.eclipse.org, instead of old CVS location with
>  script.
>- Remove bundled jar perfmsr.jar, and recreate it.
>- Run test feature.
>---
> .gitignore                 |  8 +++++++-
> eclipse-wtp-common.spec    | 44 +++++++++++++++++++++++++++++++++++++++-----
> fetch-wtp-common-source.sh | 40 ----------------------------------------
> 3 files changed, 46 insertions(+), 46 deletions(-)
> delete mode 100755 fetch-wtp-common-source.sh
>
>diff --git a/.gitignore b/.gitignore
>index 29b97cb..47d07a1 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1,4 +1,3 @@
>-
> 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
>@@ -10,3 +9,10 @@ eclipse-wtp-common-R3_3_1-fetched-src.tar.bz2
> eclipse-wtp-common-R3_4_0-fetched-src.tar.bz2
> eclipse-wtp-common-HEAD-fetched-src.tar.bz2
> /eclipse-wtp-common-3.4.0
>+eclipse-wtp-common-3.4.2/
>+R3_4_0.tar.bz2
>+R3_4_2.tar.bz2
>+webtools.common-201301291945.tar.bz2
>+webtools.common.fproj-201208170133.tar.bz2
>+webtools.common.tests-201208170133.tar.bz2
>+webtools.servertools-20130117_1051.tar.bz2
>diff --git a/eclipse-wtp-common.spec b/eclipse-wtp-common.spec
>index 4e67e95..8d61f0e 100644
>--- a/eclipse-wtp-common.spec
>+++ b/eclipse-wtp-common.spec
>@@ -1,14 +1,17 @@
> %global install_loc			%{_datadir}/eclipse/dropins
> 
> Name:			eclipse-wtp-common
>-Version:		3.4.0
>-Release:		4.20120711cvs%{?dist}
>+Version:		3.4.2
>+Release:		1%{?dist}
> Summary:		Common infrastructure and utilities developed and used with WTP
> 
> License:		EPL
> URL:			http://www.eclipse.org/webtools/common/
>-Source0:		eclipse-wtp-common-HEAD-fetched-src.tar.bz2
>-Source1:		fetch-wtp-common-source.sh
>+Source0:		http://git.eclipse.org/c/webtools-common/webtools.common.git/snapshot/R3_4_2.tar.bz2
>+Source1:		http://git.eclipse.org/c/webtools-common/webtools.common.fproj.git/snapshot/webtools.common.fproj-201208170133.tar.bz2
>+Source2:		http://git.eclipse.org/c/webtools-common/webtools.common.snippets.git/snapshot/R3_4_0.tar.bz2
>+Source3:		http://git.eclipse.org/c/webtools-common/webtools.common.tests.git/snapshot/webtools.common.tests-201208170133.tar.bz2
>+Source4:		http://git.eclipse.org/c/servertools/webtools.servertools.git/snapshot/webtools.servertools-20130117_1051.tar.bz2
> 
> BuildArch:		noarch
> 
>@@ -31,7 +34,28 @@ the eclipse web tools platform including facets, snippets view, validation and
> extensible URI resolver.
> 
> %prep
>-%setup -q -n eclipse-wtp-common-3.4.0
>+%setup -q -c
>+%setup -q -T -D -a 1
>+%setup -q -T -D -a 2
>+%setup -q -T -D -a 3
>+%setup -q -T -D -a 4
>+
>+find -name '*.jar' -delete
>+find -name '*.class' -delete
>+
>+# Build useless jar that is needed to build but does nothing
>+# See http://dev.eclipse.org/mhonarc/lists/wtp-dev/msg08607.html
>+# and PERFMSR.README.txt in org.eclipse.perfmsr.core.stub/
>+pushd R3_4_2/plugins/org.eclipse.jem.util/org.eclipse.perfmsr.core.stub/src
>+	ECLIPSE_CORE_RUNTIME=`ls %{_eclipse_base}/plugins/org.eclipse.core.runtime_*`
>+	javac -cp %{_javadir}/felix/org.osgi.core.jar:${ECLIPSE_CORE_RUNTIME} \
>+		org/eclipse/perfmsr/core/*.java
>+	jar cf ../perfmsr.jar org/
>+popd
>+
>+# Remove problematic license feature
>+find -name feature.xml -type f \
>+	-exec sed -i -e 's/license-feature="org.eclipse.license"//g' {} \;
> 
> %build
> OPTIONS="-DforceContextQualifier=201109301723 -DjavacSource=1.5 -DjavacTarget=1.5"
>@@ -53,6 +77,9 @@ eclipse-pdebuild -f org.eclipse.wst.server_core.feature \
> eclipse-pdebuild -f org.eclipse.wst.common_ui.feature \
> 	-d "emf gef" -a "$OPTIONS"
> 
>+eclipse-pdebuild -f org.eclipse.wst.common_tests.feature \
>+	-d "emf gef" -a "$OPTIONS"
>+
> %install
> install -d -m 755 %{buildroot}%{install_loc}/%{name}
> 
>@@ -77,6 +104,13 @@ unzip -q -o -d %{buildroot}%{install_loc}/%{name} \
> 
> 
> %changelog
>+* Sun Mar 17 2013 Gerard Ryan <galileo@fedoraproject.org> - 3.4.2-1
>+- Update to upstream 3.4.2
>+- Get sources from git.eclipse.org
>+- Remove and rebuild perfmsr.jar
>+- Run tests at end of build
>+
>+
> * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.0-4.20120711cvs
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>diff --git a/fetch-wtp-common-source.sh b/fetch-wtp-common-source.sh
>deleted file mode 100755
>index b0be93e..0000000
>--- a/fetch-wtp-common-source.sh
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-#!/bin/sh
>-#
>-# eclipse-wtp-common SRPM produces one binary RPM including
>-# the wtp common libraries
>-#
>-
>-#set -e
>-
>-RELEASE_TAG="HEAD"
>-DOT_TAG="3.4.0"
>-LEGACY_TAG="HEAD"
>-
>-rm -fr common
>-# get sources from wtp-common repo
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${LEGACY_TAG} common 
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${RELEASE_TAG} common 
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse export -r R3_7_maintenance org.eclipse.sdk-feature
>-mv org.eclipse.sdk-feature/features/org.eclipse.license common/features
>-rm -rf org.eclipse.sdk-feature
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${LEGACY_TAG}  servertools/plugins/org.eclipse.wst.server.core
>-mv servertools/plugins/org.eclipse.wst.server.core common/plugins
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${LEGACY_TAG}  servertools/plugins/org.eclipse.wst.internet.monitor.core
>-mv servertools/plugins/org.eclipse.wst.internet.monitor.core common/plugins
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${LEGACY_TAG}  servertools/features/org.eclipse.wst.server_core.feature
>-mv servertools/features/org.eclipse.wst.server_core.feature common/features
>-cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r ${LEGACY_TAG} jeetools/plugins/org.eclipse.jst.common.frameworks
>-mv jeetools/plugins/org.eclipse.jst.common.frameworks common/plugins
>-rm -rf eclipse-wtp-common-${DOT_TAG}
>-mv common eclipse-wtp-common-${DOT_TAG}
>-#remove old tarball
>-rm -rf eclipse-wtp-common-${RELEASE_TAG}-fetched-src.tar.bz2
>-# fix documentation permissions
>-chmod 644 `find | grep -e "\.html$"`
>-chmod 644 `find | grep -e "\.xml$"`
>-#make tarball
>-tar cjf eclipse-wtp-common-${RELEASE_TAG}-fetched-src.tar.bz2 eclipse-wtp-common-${DOT_TAG}
>-#clean
>-rm -rf eclipse-wtp-common-${DOT_TAG}
>-rm -rf servertools
>-rm -rf jeetools
>\ No newline at end of file
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 922452: 711264