[eclipse-mylyn-context/f16] Update to upstream 3.6.2 license.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Oct 7 10:41:43 UTC 2011
commit ae180511383122c1186f3031ce44c82487e8cf16
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Oct 7 13:40:40 2011 +0300
Update to upstream 3.6.2 license.
.gitignore | 1 +
eclipse-mylyn-context.spec | 30 +++++++++---------------------
sources | 2 +-
3 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb657fb..bb7dff2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
eclipse-mylyn-context-R_3_5_0-fetched-src.tar.bz2
eclipse-mylyn-context-R_3_5_1-fetched-src.tar.bz2
R_3_6_0.tar.bz2
+R_3_6_2.tar.bz2
diff --git a/eclipse-mylyn-context.spec b/eclipse-mylyn-context.spec
index 6222ca4..b133169 100644
--- a/eclipse-mylyn-context.spec
+++ b/eclipse-mylyn-context.spec
@@ -2,7 +2,7 @@
%global install_loc %{_datadir}/eclipse/dropins
# Taken from update site so we match upstream
# http://download.eclipse.org/mylyn/archive/3.6.0/v20110608-1400/
-%global qualifier v20110608-1400
+%global qualifier v20110908-0706
# Builds the following upstream features:
# - org.eclipse.mylyn.team-feature
@@ -13,12 +13,12 @@
Name: eclipse-mylyn-context
Summary: Eclipse Mylyn context specific features
-Version: 3.6.0
-Release: 2%{?dist}
+Version: 3.6.2
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
-Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.context.git/snapshot/R_3_6_0.tar.bz2
+Source0: http://git.eclipse.org/c/mylyn/org.eclipse.mylyn.context.git/snapshot/R_3_6_2.tar.bz2
BuildArch: noarch
@@ -98,7 +98,7 @@ Mylyn Task-Focused UI extensions for Team version control.
%prep
-%setup -q -n R_3_6_0
+%setup -q -n R_3_6_2
# remove unneeded sources
ls -1 | grep -vE 'org.eclipse.mylyn.team.ui|org.eclipse.mylyn.context.ui|org.eclipse.mylyn.resources.ui|org.eclipse.mylyn.team-feature|org.eclipse.mylyn.cdt-feature|org.eclipse.mylyn.cdt.ui|org.eclipse.mylyn.java-feature|org.eclipse.mylyn.java.ui|org.eclipse.mylyn.ide.ant|org.eclipse.mylyn.ide.ui|org.eclipse.mylyn.java.tasks|org.eclipse.mylyn.pde-feature|org.eclipse.mylyn.pde.ui|org.eclipse.mylyn.context-feature' | xargs rm -rf
@@ -106,7 +106,7 @@ ls -1 | grep -vE 'org.eclipse.mylyn.team.ui|org.eclipse.mylyn.context.ui|org.ecl
%build
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.context_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
- -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar -d "mylyn"
+ -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar -d "mylyn-commons mylyn"
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.team_feature \
-a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \
-j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar
@@ -142,51 +142,39 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn-cdt \
# eclipse-mylyn-context
-
%files
-%defattr(-,root,root,-)
%{install_loc}/mylyn-context
%doc org.eclipse.mylyn.context-feature/license.html
%doc org.eclipse.mylyn.context-feature/epl-v10.html
-
# eclipse-mylyn-context-java
-
%files java
-%defattr(-,root,root,-)
%{install_loc}/mylyn-java
%doc org.eclipse.mylyn.java-feature/license.html
%doc org.eclipse.mylyn.java-feature/epl-v10.html
-
# eclipse-mylyn-context-pde
-
%files pde
-%defattr(-,root,root,-)
%{install_loc}/mylyn-pde
%doc org.eclipse.mylyn.pde-feature/license.html
%doc org.eclipse.mylyn.pde-feature/epl-v10.html
-
# eclipse-mylyn-context-cdt
-
%files cdt
-%defattr(-,root,root,-)
%{install_loc}/mylyn-cdt
%doc org.eclipse.mylyn.cdt-feature/license.html
%doc org.eclipse.mylyn.cdt-feature/epl-v10.html
-
# eclipse-mylyn-context-team
-
%files team
-%defattr(-,root,root,-)
%{install_loc}/mylyn-context-team
%doc org.eclipse.mylyn.team-feature/license.html
%doc org.eclipse.mylyn.team-feature/epl-v10.html
-
%changelog
+* Fri Oct 7 2011 Alexander Kurtakov <akurtako at redhat.com> 3.6.2-1
+- Update to upstream 3.6.2 license.
+
* Thu Jul 14 2011 Severin Gehwolf <sgehwolf at redhat.com> 3.6.0-2
- Mylyn requires Eclipse 3.5 and up. Changed R/BRs
accordingly.
diff --git a/sources b/sources
index efd2fe8..e31f536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3d1be4e8da2f1a28c5c4e4cceca53543 R_3_6_0.tar.bz2
+7ce5ff6d88eecb0c198a71399b479fed R_3_6_2.tar.bz2
More information about the scm-commits
mailing list