[sisu] Update to upstream version 0.3.0
by Mikolaj Izdebski
commit c1fc5d9a5998f14118375276b3ea737ade81cf98
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Feb 23 11:41:02 2015 +0100
Update to upstream version 0.3.0
.gitignore | 2 ++
sisu-OSGi-import-guava.patch | 10 ++++++++++
sisu-java8.patch | 38 --------------------------------------
sisu.spec | 11 ++++++-----
sources | 4 ++--
5 files changed, 20 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd7e4bd..0186fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
/org.eclipse.sisu.plexus-0.2.1.tar.bz2
/org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
/org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
+/org.eclipse.sisu.inject-0.3.0.tar.bz2
+/org.eclipse.sisu.plexus-0.3.0.tar.bz2
diff --git a/sisu-OSGi-import-guava.patch b/sisu-OSGi-import-guava.patch
index 3b4e749..8ab5759 100644
--- a/sisu-OSGi-import-guava.patch
+++ b/sisu-OSGi-import-guava.patch
@@ -8,3 +8,13 @@
org.osgi.framework;version="1.5",
org.osgi.util.tracker;version="1.4",
org.slf4j;resolution:=optional,
+--- sisu-inject/org.eclipse.sisu.inject/build.properties~ 2015-02-25 14:46:42.392037463 +0100
++++ sisu-inject/org.eclipse.sisu.inject/build.properties 2015-02-25 14:44:56.626803789 +0100
+@@ -17,5 +17,5 @@
+ .
+
+ # build with JSR250 v1.2 and workaround indirect Guava dependency via Guice 4
+-extra.. = platform:/plugin/javax.annotation,platform:/plugin/com.google.guava
+-additional.bundles = javax.annotation,com.google.guava
++extra.. = platform:/plugin/javax.annotation-api,platform:/plugin/com.google.guava
++additional.bundles = javax.annotation-api,com.google.guava
diff --git a/sisu.spec b/sisu.spec
index 665108e..b90622b 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -1,11 +1,11 @@
# Release type, either "milestone" or "release"
-%global reltype milestone
-%global reltag .M1
+%global reltype release
+#global reltag .M1
Name: sisu
Epoch: 1
Version: 0.3.0
-Release: 0.2%{?reltag}%{?dist}
+Release: 1%{?dist}
Summary: Eclipse dependency injection framework
License: EPL
URL: http://eclipse.org/sisu
@@ -14,7 +14,6 @@ Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/
Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/...
Patch0: %{name}-OSGi-import-guava.patch
-Patch1: %{name}-java8.patch
Patch2: %{name}-ignored-tests.patch
Patch3: %{name}-plexus-utils-3.0.18.patch
@@ -119,7 +118,6 @@ tar xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s
tar xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s
%patch0
-%patch1
%patch2
%patch3
@@ -208,6 +206,9 @@ EOF
%changelog
+* Mon Feb 23 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.3.0-1
+- Update to upstream version 0.3.0
+
* Wed Feb 18 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:0.3.0-0.2.M1
- Unbundle ASM
- Resolves: rhbz#1085903
diff --git a/sources b/sources
index 8794505..5fea523 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7c8e0b75878b71e5b77e2a8e1b35ffa8 org.eclipse.sisu.inject-0.3.0.M1.tar.bz2
-4afe3fb24ff0d93066b670e288c365b3 org.eclipse.sisu.plexus-0.3.0.M1.tar.bz2
+ed53df7106aac1e8746301f65de3691b org.eclipse.sisu.inject-0.3.0.tar.bz2
+6ec9b89577a98add2b9a58c5e35acf5d org.eclipse.sisu.plexus-0.3.0.tar.bz2
9 years, 2 months
[eclipse-mylyn] Update to upstream 3.14.2 release.
by Alexander Kurtakov
commit 9c1731a8bb59a380e59f2b469fe813e04e16e8e8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Feb 19 17:57:48 2015 +0200
Update to upstream 3.14.2 release.
eclipse-mylyn-merge-incubator.patch | 4 +-
eclipse-mylyn-remove-epubcheck-tests.patch | 2072 ----------------------------
eclipse-mylyn.spec | 34 +-
fetch-eclipse-mylyn-incubator.sh | 2 +-
fetch-eclipse-mylyn.sh | 2 +-
sources | 4 +-
6 files changed, 24 insertions(+), 2094 deletions(-)
---
diff --git a/eclipse-mylyn-merge-incubator.patch b/eclipse-mylyn-merge-incubator.patch
index 418af65..ead7f4d 100644
--- a/eclipse-mylyn-merge-incubator.patch
+++ b/eclipse-mylyn-merge-incubator.patch
@@ -3,7 +3,7 @@
@@ -13,8 +13,7 @@
id="org.eclipse.mylyn.web.tasks_feature"
label="%featureName"
- version="3.13.0.qualifier"
+ version="3.14.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.mylyn.sandbox.ui">
+ provider-name="%providerName">
@@ -15,7 +15,7 @@
@@ -13,8 +13,7 @@
id="org.eclipse.mylyn.trac.wiki_feature"
label="%featureName"
- version="3.13.0.qualifier"
+ version="3.14.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.mylyn.sandbox.ui">
+ provider-name="%providerName">
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index bb5deda..b6c8a08 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -1,10 +1,10 @@
-%global tag R_3_14_0
-%global incubator_tag af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b
+%global tag R_3_14_2
+%global incubator_tag e963896478edf4fb7b4474895b15c6359aaa9a17
Name: eclipse-mylyn
Summary: Eclipse Mylyn main feature.
-Version: 3.14.0
-Release: 3%{?dist}
+Version: 3.14.2
+Release: 1%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -17,13 +17,12 @@ Source8: fetch-eclipse-mylyn-incubator.sh
Patch0: %{name}-remove-hudson-discovery.patch
Patch1: %{name}-add-apache-xmlrpc.patch
-Patch3: %{name}-disable-online-tests.patch
-Patch4: %{name}-merge-incubator.patch
-Patch5: %{name}-bug-419133.patch
-Patch6: lucene4.patch
-Patch7: %{name}-remove-epubcheck-tests.patch
-Patch8: %{name}-remove-nullable-annotation.patch
-Patch9: explicit-hamcrest-use.patch
+Patch2: %{name}-disable-online-tests.patch
+Patch3: %{name}-merge-incubator.patch
+Patch4: %{name}-bug-419133.patch
+Patch5: lucene4.patch
+Patch6: %{name}-remove-nullable-annotation.patch
+Patch7: explicit-hamcrest-use.patch
BuildArch: noarch
@@ -204,14 +203,14 @@ tar xaf %{SOURCE7} -C org.eclipse.mylyn.tasks --strip-components=1
%patch0
%patch1
+%patch2 -b .sav
%patch3 -b .sav
-%patch4 -b .sav
-%patch5
+%patch4
pushd org.eclipse.mylyn.tasks
-%patch6 -p1 -b .sav
+%patch5 -p1 -b .sav
popd
-%patch8
-%patch9
+%patch6
+%patch7
# Disable plugins we can live without (they are skipped by default anyway)
for p in findbugs-maven-plugin maven-pmd-plugin jacoco-maven-plugin ; do
@@ -332,6 +331,9 @@ install %{SOURCE6} \
%files tests -f .mfiles-tests
%changelog
+* Thu Feb 19 2015 Alexander Kurtakov <akurtako(a)redhat.com> 3.14.2-1
+- Update to upstream 3.14.2.
+
* Thu Feb 5 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.14.0-3
- Rebuild to fix auto-requires
diff --git a/fetch-eclipse-mylyn-incubator.sh b/fetch-eclipse-mylyn-incubator.sh
index bf54846..cee783b 100755
--- a/fetch-eclipse-mylyn-incubator.sh
+++ b/fetch-eclipse-mylyn-incubator.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b"
+RELEASE_TAG="e963896478edf4fb7b4474895b15c6359aaa9a17"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-incubator-fetched-src"
#clean up old runs
diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh
index 86dd705..b457636 100755
--- a/fetch-eclipse-mylyn.sh
+++ b/fetch-eclipse-mylyn.sh
@@ -2,7 +2,7 @@
set -e
-RELEASE_TAG="R_3_14_0"
+RELEASE_TAG="R_3_14_2"
FETCHED_SOURCES_NAME="eclipse-mylyn-${RELEASE_TAG}-fetched-src"
#clean up old runs
diff --git a/sources b/sources
index 38d2e2e..53f064f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3f4441cd26c55c1875b43b993cb2a670 eclipse-mylyn-af9c0aaf3a4e28ced4a09e0a5e09d80dd5933a4b-incubator-fetched-src.tar.xz
-5825e91955cb0e1442fc260da8c64a37 eclipse-mylyn-R_3_14_0-fetched-src.tar.xz
+09dbe06a20507620fa1a0e5c2535b9be eclipse-mylyn-R_3_14_2-fetched-src.tar.xz
+464f25c33cb15af8e45ae707d7a609f1 eclipse-mylyn-e963896478edf4fb7b4474895b15c6359aaa9a17-incubator-fetched-src.tar.xz
9 years, 2 months
[eclipse] Add missing sources
by Mat Booth
commit c7e197f5f25b90a0404d62bc26be9b48411a1cec
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Feb 19 15:33:18 2015 +0000
Add missing sources
sources | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/sources b/sources
index a859ede..78d584a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-078ea3a8611e0aebcb1a5b5c037e101c R4_platform-aggregator-I20150210-0800.tar.xz
+d278fe90472b34231fba180c8bdaf7e6 R4_platform-aggregator-I20150217-0800.tar.xz
1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2
9 years, 2 months
[eclipse] Update to latest I-build
by Mat Booth
commit db2abf334d5bd9480c3824b5c1a2ca0ce9f919fc
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Thu Feb 19 15:13:45 2015 +0000
Update to latest I-build
- Unbundle third party libs from tests subpackage rhbz#1150185
- Rebuild for new eclipse-ecf/httpcomponents
eclipse.spec | 44 ++++++++++++++++++++++++++++----------------
get-eclipse.sh | 2 +-
2 files changed, 29 insertions(+), 17 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index f792257..5840ed7 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -13,7 +13,7 @@ Epoch: 1
%global eclipse_minor 5
%global eclipse_micro 0
%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
-%global eclipse_tag I20150210-0800
+%global eclipse_tag I20150217-0800
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
%global _jetty_version 9.2.7
@@ -38,7 +38,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.1.git201502100800%{?dist}
+Release: 0.2.git201502170800%{?dist}
License: EPL
URL: http://www.eclipse.org/
@@ -164,18 +164,19 @@ BuildRequires: zip
BuildRequires: sac >= 1.3-12
BuildRequires: batik-css >= 1.8-0.17
BuildRequires: xml-commons-apis >= 1.4.01-12
-BuildRequires: atinject >= 1-6
+BuildRequires: atinject >= 1-18
+BuildRequires: atinject-tck >= 1-18
BuildRequires: tycho >= 0.22
BuildRequires: tycho-extras >= 0.22
-BuildRequires: eclipse-ecf-core >= 3.9.2-1
+BuildRequires: eclipse-ecf-core >= 3.9.2-2
BuildRequires: eclipse-emf-core >= 1:2.10.1-3
BuildRequires: glassfish-jsp-api >= 2.2.1-4
BuildRequires: glassfish-jsp >= 2.2.5
BuildRequires: glassfish-servlet-api >= 3.1.0
BuildRequires: cbi-plugins
BuildRequires: xml-maven-plugin
-BuildRequires: httpcomponents-core
-BuildRequires: httpcomponents-client
+BuildRequires: httpcomponents-core >= 4.4-1
+BuildRequires: httpcomponents-client >= 4.4-1
BuildRequires: mockito
%if ! %{bootstrap}
BuildRequires: eclipse-pde
@@ -231,9 +232,9 @@ Requires: sat4j >= 2.3.5-1
Requires: sac >= 1.3-12
Requires: batik-css >= 1.8-0.17
Requires: xml-commons-apis >= 1.4.01-12
-Requires: atinject >= 1-6
+Requires: atinject >= 1-18
Requires: geronimo-annotation >= 1.0-7
-Requires: eclipse-ecf-core >= 3.9.2-1
+Requires: eclipse-ecf-core >= 3.9.2-2
Requires: eclipse-emf-core >= 1:2.10.1-3
Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5
@@ -241,8 +242,8 @@ Requires: glassfish-servlet-api >= 3.1.0
Requires: %{?scl_prefix}icu4j >= 1:54.1.1-2
Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
-Requires: httpcomponents-core
-Requires: httpcomponents-client
+Requires: httpcomponents-core >= 4.4-1
+Requires: httpcomponents-client >= 4.4-1
%{?scl:Requires: %scl_runtime}
Obsoletes: %{name}-rcp < 1:4.3.0
Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
@@ -291,6 +292,7 @@ Summary: Eclipse Tests
Requires: %{name}-pde = %{epoch}:%{eclipse_version}-%{release}
Requires: easymock3
Requires: mockito
+Requires: atinject-tck >= 1-18
%description tests
Eclipse Tests.
@@ -722,17 +724,24 @@ rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/plugins
+ f=`ls | grep -e "^com.google.code.atinject.tck_"`
+ rm -rf $f
+ ln -s %{_javadir}/atinject-tck.jar ${f%.jar}.jar
f=`ls | grep -e "^org.easymock_"`
- rm -rf $f
+ rm -rf $f
ln -s %{_javadir}/easymock.jar ${f%.jar}.jar
f=`ls | grep -e "^org.mockito.mockito-core_"`
- rm -rf $f
+ rm -rf $f
ln -s %{_javadir}/mockito.jar ${f%.jar}.jar
f=`ls | grep -e "^org.objenesis_"`
- rm -rf $f
+ rm -rf $f
ln -s %{_javadir}/objenesis/objenesis.jar ${f%.jar}.jar
+ for ham in core text library integration ; do
+ f=`ls | grep -e "^org.hamcrest.${ham}_"`
+ rm -rf $f
+ ln -s %{_javadir}/hamcrest/${ham}.jar ${f%.jar}.jar
+ done
# These are already present in the platform
- rm -rf org.hamcrest.core_*
rm -rf org.junit_*
popd
@@ -805,7 +814,6 @@ fi
%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.core.feature_*
%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
-%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
%{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{pkg_name}/plugins/javax.servlet-api_*
@@ -924,7 +932,6 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.console_*
-%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ql_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.operations_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui_*
@@ -1010,6 +1017,11 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
+* Wed Feb 18 2015 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.0-0.2.git201502170800
+- Update to latest I-build
+- Unbundle third party libs from tests subpackage rhbz#1150185
+- Rebuild for new eclipse-ecf/httpcomponents
+
* Fri Jan 30 2015 Mat Booth <mat.booth(a)redhat.com> - 1:4.5.0-0.1.git201502100800
- Update to latest 4.5.0 I-build
- Drop upstreamed jetty9/servlet and workspace picker patches
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 784320e..63da26d 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.r...
-TAG=I20150210-0800
+TAG=I20150217-0800
rm -rf R4_platform-aggregator-$TAG
rm -rf R4_platform-aggregator-$TAG.tar.xz
9 years, 2 months