diff --git a/.gitignore b/.gitignore index eafbc7f..7cdfbc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ -egit*.bz2 -/egit-3.0.0.201306101825-r +/egit*.bz2 +/egit-*/ /noarch /.build-*.log /*.src.rpm +/.project diff --git a/eclipse-egit.spec b/eclipse-egit.spec index 5a62082..efb28f0 100644 --- a/eclipse-egit.spec +++ b/eclipse-egit.spec @@ -1,12 +1,12 @@ %global install_loc %{_datadir}/eclipse/dropins/egit -%global version_suffix 201406110918-r +%global version_suffix 201406201815-r %{?scl:%scl_package eclipse-egit} %{!?scl:%global pkg_name %{name}} Summary: Eclipse Git Integration Name: %{?scl_prefix}eclipse-egit -Version: 3.4.0 +Version: 3.4.1 Release: 1%{?dist} License: EPL URL: http://www.eclipse.org/egit @@ -14,13 +14,13 @@ Group: Development/Tools Source0: http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{version}.%{version_suffix}.tar.bz2 BuildRequires: java-devel >= 1.6.0 -BuildRequires: %{?scl_prefix}eclipse-jgit >= 3.4.0 -BuildRequires: %{?scl_prefix}jgit >= 3.4.0 +BuildRequires: %{?scl_prefix}eclipse-jgit >= 3.4.1 +BuildRequires: %{?scl_prefix}jgit >= 3.4.1 BuildRequires: tycho BuildRequires: %{?scl_prefix}eclipse-mylyn-context-team BuildRequires: %{?scl_prefix}eclipse-mylyn-docs-wikitext Requires: %{?scl_prefix}eclipse-platform >= 1:3.5.0 -Requires: %{?scl_prefix}eclipse-jgit >= 3.4.0 +Requires: %{?scl_prefix}eclipse-jgit >= 3.4.1 %{?scl:Requires: %scl_runtime} BuildArch: noarch @@ -58,9 +58,6 @@ sed -i -e "15,29d" org.eclipse.egit.repository/category.xml sed -i -e "9,11d" org.eclipse.egit.repository/category.xml sed -i -e "12,14d" org.eclipse.egit.repository/category.xml -# Allow building against newer versions of mylyn wikitext -sed -i -e "s|1.3.0,2.0.0|1.3.0,3.0.0|g" org.eclipse.egit.doc/META-INF/MANIFEST.MF - %build xmvn -o clean verify -Dmaven.test.skip=true @@ -96,6 +93,9 @@ rm $RPM_BUILD_ROOT%{install_loc}/eclipse/*.jar %{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar %changelog +* Thu Jun 26 2014 Mat Booth - 3.4.1-1 +- Update to latest upstream release 3.4.1 + * Fri Jun 13 2014 Roland Grunberg - 3.4.0-1 - Update to 3.4.0. diff --git a/sources b/sources index 86a5ec7..aa4dd26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec56cd13b9cdbd0f48b8eb59e1096482 egit-3.4.0.201406110918-r.tar.bz2 +2c245e6f984371b2fea423268c13ded2 egit-3.4.1.201406201815-r.tar.bz2