[eclipse-testng] Add BR: slf4j now that it's no longer transitive one.
by Alexander Kurtakov
commit bf1c6e44d0a08c5602a029eac4ecb5c7e1b3b9a7
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Mar 9 10:35:29 2015 +0200
Add BR: slf4j now that it's no longer transitive one.
eclipse-testng.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/eclipse-testng.spec b/eclipse-testng.spec
index 5c86a7a..0e15687 100644
--- a/eclipse-testng.spec
+++ b/eclipse-testng.spec
@@ -4,7 +4,7 @@
Name: eclipse-testng
Version: 6.8.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: TestNG plug-in for Eclipse
License: ASL 2.0
URL: http://testng.org
@@ -43,6 +43,7 @@ BuildRequires: testng >= 6.8
BuildRequires: beust-jcommander
BuildRequires: snakeyaml
BuildRequires: base64coder
+BuildRequires: slf4j
%description
The Eclipse TestNG plug-in integrates the TestNG testing framework into the
@@ -88,6 +89,9 @@ popd
%{eclipse_dropin}/testng-eclipse
%changelog
+* Mon Mar 9 2015 Alexander Kurtakov <akurtako(a)redhat.com> 6.8.6-5
+- Add BR: slf4j now that it's no longer transitive one.
+
* Wed Jul 30 2014 Mat Booth <mat.booth(a)redhat.com> - 6.8.6-4
- Restore testng as an embedded lib due to runtime issues
9 years, 2 months
[eclipse-swtbot] Add BR on full hamcrest now that platform depend only on part of it.
by Alexander Kurtakov
commit eda68b04470ab217acd5b6e233c03d3ae78d6a5c
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Mar 9 10:22:52 2015 +0200
Add BR on full hamcrest now that platform depend only on part of it.
eclipse-swtbot.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/eclipse-swtbot.spec b/eclipse-swtbot.spec
index 10f4299..c1e2387 100644
--- a/eclipse-swtbot.spec
+++ b/eclipse-swtbot.spec
@@ -1,6 +1,6 @@
Name: eclipse-swtbot
Version: 2.2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: UI and functional testing tool for SWT and Eclipse based applications
License: EPL
@@ -16,6 +16,7 @@ BuildRequires: cbi-plugins
BuildRequires: eclipse-license
BuildRequires: tycho
BuildRequires: log4j12
+BuildRequires: hamcrest
BuildArch: noarch
%description
@@ -52,6 +53,9 @@ done
%files -f .mfiles
%changelog
+* Mon Mar 9 2015 Alexander Kurtakov <akurtako(a)redhat.com> 2.2.1-5
+- Add BR on full hamcrest now that platform depend only on part of it.
+
* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-4
- Rebuild to generate missing OSGi auto-requires
9 years, 2 months
[eclipse-mpc/f22] Update to Luna SR2 release
by Mat Booth
commit d181110ccfbc4e9d8327b7382c8be3a8e6c0019a
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Mar 6 13:55:06 2015 +0000
Update to Luna SR2 release
.gitignore | 10 ++--------
eclipse-mpc.spec | 22 +++++++++++-----------
explicit-hamcrest-use.patch | 10 ----------
sources | 2 +-
4 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80feb2c..e17add9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
-/eclipse-mpc-fetched-src-*.tar.xz
-R_*
-R_1_1_0.tar.bz2
-R_1_1_1.tar.bz2
/noarch
-/R_1_2_2.tar.bz2
-/R_1_3_0a.tar.bz2
-/R_1_3_1.tar.bz2
-*.src.rpm
+/*.src.rpm
+/org.eclipse.epp.mpc-*.tar.bz2
diff --git a/eclipse-mpc.spec b/eclipse-mpc.spec
index dd5a325..9bc7a49 100644
--- a/eclipse-mpc.spec
+++ b/eclipse-mpc.spec
@@ -1,17 +1,13 @@
-%global src_repo_tag R_1_3_1
+%global src_repo_tag R_1_3_2
Name: eclipse-mpc
-Version: 1.3.1
-Release: 5%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: Eclipse Marketplace Client
-Group: Development/Tools
License: EPL
URL: http://www.eclipse.org/mpc/
-Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/%{src_repo_...
-
-# Patch submitted upstream: https://bugs.eclipse.org/bugs/show_bug.cgi?id=457914
-Patch0: explicit-hamcrest-use.patch
+Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/org.eclipse...
BuildArch: noarch
@@ -30,17 +26,18 @@ Requires: eclipse-p2-discovery >= 1.0.0
The Eclipse Marketplace Client provides access to extension catalogs.
%prep
-%setup -q -n %{src_repo_tag}
-%patch0
+%setup -q -n org.eclipse.epp.mpc-%{src_repo_tag}
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc-parent/pom.xml
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc-parent/bundle/pom.xml
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc.ui/pom.xml
%pom_remove_plugin org.eclipse.tycho:target-platform-configuration org.eclipse.epp.mpc-parent/pom.xml
%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='tycho-packaging-plugin']" org.eclipse.epp.mpc-parent/pom.xml
-sed -i '/Bundle-SymbolicName/ s/$/;singleton:=true/' org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
%pom_disable_module org.eclipse.epp.mpc.site
+# Non-strict compiler checking
+sed -i -e '/strictCompilerTarget/d' org.eclipse.epp.mpc-parent/pom.xml
+
%mvn_package ":*.tests" __noinstall
%mvn_package ":*.tests.*" __noinstall
%mvn_package "::jar:sources:"
@@ -54,6 +51,9 @@ sed -i '/Bundle-SymbolicName/ s/$/;singleton:=true/' org.eclipse.epp.mpc.core/ME
%files -f .mfiles
%changelog
+* Fri Mar 06 2015 Mat Booth <mat.booth(a)redhat.com> - 1.3.2-1
+- Update to Luna SR2 release
+
* Fri Feb 6 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.3.1-5
- Rebuild to generate missing OSGi auto-requires
diff --git a/sources b/sources
index 9625fb0..2a6e67f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7cbbf335aaf22c5b3625a95fcd2018b R_1_3_1.tar.bz2
+33ae216ac3d34a5d61ac9ab762c19001 org.eclipse.epp.mpc-R_1_3_2.tar.bz2
9 years, 3 months
[eclipse-mpc/f21] Update to Luna SR2 release
by Mat Booth
commit bf21719115779fd081f7c51761f61a32cf53146c
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Fri Mar 6 14:26:29 2015 +0000
Update to Luna SR2 release
.gitignore | 9 ++-------
eclipse-mpc.spec | 19 ++++++++++++-------
sources | 2 +-
3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b7ecb3..e17add9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-/eclipse-mpc-fetched-src-*.tar.xz
-R_*
-R_1_1_0.tar.bz2
-R_1_1_1.tar.bz2
/noarch
-/R_1_2_2.tar.bz2
-/R_1_3_0a.tar.bz2
-/R_1_3_1.tar.bz2
+/*.src.rpm
+/org.eclipse.epp.mpc-*.tar.bz2
diff --git a/eclipse-mpc.spec b/eclipse-mpc.spec
index da7fa99..b07364b 100644
--- a/eclipse-mpc.spec
+++ b/eclipse-mpc.spec
@@ -1,15 +1,14 @@
-%global src_repo_tag R_1_3_1
+%global src_repo_tag R_1_3_2
%global install_loc %{_datadir}/eclipse/dropins/mpc
Name: eclipse-mpc
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
Summary: Eclipse Marketplace Client
-Group: Development/Tools
License: EPL
URL: http://www.eclipse.org/mpc/
-Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/%{src_repo_...
+Source0: http://git.eclipse.org/c/mpc/org.eclipse.epp.mpc.git/snapshot/org.eclipse...
BuildArch: noarch
@@ -27,13 +26,16 @@ Requires: eclipse-p2-discovery >= 1.0.0
The Eclipse Marketplace Client provides access to extension catalogs.
%prep
-%setup -q -n %{src_repo_tag}
+%setup -q -n org.eclipse.epp.mpc-%{src_repo_tag}
+
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc-parent/pom.xml
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc-parent/bundle/pom.xml
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin org.eclipse.epp.mpc.ui/pom.xml
%pom_remove_plugin org.eclipse.tycho:target-platform-configuration org.eclipse.epp.mpc-parent/pom.xml
%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId='tycho-packaging-plugin']" org.eclipse.epp.mpc-parent/pom.xml
-sed -i '/Bundle-SymbolicName/ s/$/;singleton:=true/' org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
+
+# Non-strict compiler checking
+sed -i -e '/strictCompilerTarget/d' org.eclipse.epp.mpc-parent/pom.xml
%build
%mvn_build -i -j -f -- -Pdist -DforceContextQualifier=v%(date +%%Y%%m%%d%%H%%M%%S)
@@ -48,6 +50,9 @@ xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
%{install_loc}
%changelog
+* Fri Mar 06 2015 Mat Booth <mat.booth(a)redhat.com> - 1.3.2-1
+- Update to Luna SR2 release
+
* Fri Nov 7 2014 Alexander Kurtakov <akurtako(a)redhat.com> 1.3.1-2
- Prepend v to qualifier to make update center not proposing updates.
diff --git a/sources b/sources
index 9625fb0..2a6e67f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7cbbf335aaf22c5b3625a95fcd2018b R_1_3_1.tar.bz2
+33ae216ac3d34a5d61ac9ab762c19001 org.eclipse.epp.mpc-R_1_3_2.tar.bz2
9 years, 3 months
[jetty] Rebuild against tomcat-taglibs-standard.
by Alexander Kurtakov
commit 243fd976b74088124d57bbc88c15c5ccc86f5be0
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Thu Mar 5 22:03:13 2015 +0200
Rebuild against tomcat-taglibs-standard.
jetty.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 2c9c1b5..90f0aad 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
Name: jetty
Version: 9.2.9
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -81,7 +81,7 @@ BuildRequires: glassfish-el
BuildRequires: glassfish-el-api
BuildRequires: glassfish-jsp
BuildRequires: glassfish-jsp-api
-BuildRequires: jakarta-taglibs-standard
+BuildRequires: tomcat-taglibs-standard
BuildRequires: java-devel >= 1:1.7.0
BuildRequires: jpackage-utils
BuildRequires: javapackages-tools >= 0.7.0
@@ -722,7 +722,8 @@ build-jar-repository %{buildroot}%{homedir}/lib/annotations \
build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
build-jar-repository %{buildroot}%{homedir}/lib/jsp glassfish-el-api \
- glassfish-el taglibs-core taglibs-standard glassfish-jsp \
+ glassfish-el tomcat-taglibs-standard/taglibs-standard-compat \
+ tomcat-taglibs-standard/taglibs-standard-impl glassfish-jsp \
glassfish-jsp-api ecj
ln -sf $(build-classpath jboss-transaction-1.2-api) \
@@ -896,6 +897,9 @@ exit 0
%doc NOTICE.txt LICENSE*
%changelog
+* Thu Mar 5 2015 Alexander Kurtakov <akurtako(a)redhat.com> 9.2.9-2
+- Rebuild against tomcat-taglibs-standard.
+
* Wed Feb 25 2015 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 9.2.9-1
- Update to upstream version 9.2.9
- Resolves: CVE-2015-2080
9 years, 3 months
[eclipse-remote] Update to 1.1.1
by Mat Booth
Summary of changes:
2479c4a... Update to 1.1.1 (*)
(*) This commit already existed in another branch; no separate mail sent
9 years, 3 months
