[eclipse-wtp-jsf] Update to upstream 3.4.1; get sources from git.eclipse.org

Gerard Ryan galileo at fedoraproject.org
Sat Nov 3 02:27:15 UTC 2012


commit 7fac6853c7ef9acbbaa909c312565cd28f1a9dba
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Nov 3 02:25:34 2012 +0000

    Update to upstream 3.4.1; get sources from git.eclipse.org

 eclipse-wtp-jsf.spec |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-wtp-jsf.spec b/eclipse-wtp-jsf.spec
index ae78480..8a47a44 100644
--- a/eclipse-wtp-jsf.spec
+++ b/eclipse-wtp-jsf.spec
@@ -1,16 +1,17 @@
 %global	install_loc	%{_datadir}/eclipse/dropins/%{name}
 %global	install_loc_sdk	%{_datadir}/eclipse/dropins/%{name}-sdk
+%global git_tag		R3_4_1
+
 Name:		eclipse-wtp-jsf
-Version:	3.4.0
-Release:	2%{?dist}
+Version:	3.4.1
+Release:	1%{?dist}
 Summary:	Tools for building JSF-based, web-enabled applications
 
 Group:		Development/Libraries
 License:	EPL
 URL:		http://www.eclipse.org/webtools/jsf/main.php
 
-# fetch-eclipse-wtp-jsf-using-map.sh
-Source0:	%{name}-%{version}.tar.xz
+Source0:	http://git.eclipse.org/c/jsf/webtools.jsf.git/snapshot/%{git_tag}.tar.bz2
 
 BuildArch:	noarch
 
@@ -65,11 +66,14 @@ Requires:	%{name} >= %{version}-%{release}
 Documentation and source for %{name}
 
 %prep
-%setup -q
+%setup -q -n %{git_tag}
 
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
+# Remove problematic org.eclipse.license stuff
+find -name feature.xml -type f -exec sed -i -e 's/license-feature="org.eclipse.license"//g' {} \;
+
 
 %build
 eclipse-pdebuild -f org.eclipse.jsf.feature -d "wtp-sourceediting eclipse-wtp-jst-web emf emf-sdk eclipse-wtp-common wtp-jeetools org.eclipse.jst.server_ui.feature gef"
@@ -101,14 +105,18 @@ install -d -m 755 %{buildroot}%{install_loc_sdk}
 
 %files
 %{install_loc}
-%doc org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
+%doc jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
 
 %files sdk
 %{install_loc_sdk}
-%doc org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
+%doc jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
 
 
 %changelog
+* Sat Nov 03 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.4.1-1
+- Update to upstream 3.4.1.
+- Change location for source retrieval to git.eclipse.org.
+
 * Fri Jul 21 2012 Gerard Ryan <galileo at fedoraproject.org> - 3.4.0-2
 - Add sdk features.
 


More information about the scm-commits mailing list