diff --git a/.devtoolset-3-eclipse-egit.metadata b/.devtoolset-3-eclipse-egit.metadata index e6cc3e0..f18a931 100644 --- a/.devtoolset-3-eclipse-egit.metadata +++ b/.devtoolset-3-eclipse-egit.metadata @@ -1 +1 @@ -996f883ba97dab73098c624c42a38728b26c5239 SOURCES/egit-3.4.1.201406201815-r.tar.bz2 +da84075f5bb967406bd3065511e6a9defca8b168 SOURCES/egit-3.6.1.201501031845-r.tar.bz2 diff --git a/.gitignore b/.gitignore index ae9395b..bbec93b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/egit-3.4.1.201406201815-r.tar.bz2 +SOURCES/egit-3.6.1.201501031845-r.tar.bz2 diff --git a/SPECS/eclipse-egit.spec b/SPECS/eclipse-egit.spec index 3e38a28..af55afd 100644 --- a/SPECS/eclipse-egit.spec +++ b/SPECS/eclipse-egit.spec @@ -1,29 +1,34 @@ -%global install_loc %{_datadir}/eclipse/dropins/egit -%global version_suffix 201406201815-r +# EGit and Mylyn have circular dependencies +# EGit can build bootstrapped when Mylyn not present +%global bootstrap 0 +%global version_suffix 201501031845-r %{?scl:%scl_package eclipse-egit} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} -Summary: Eclipse Git Integration +%{?java_common_find_provides_and_requires} + Name: %{?scl_prefix}eclipse-egit -Version: 3.4.1 -Release: 1%{?dist} +Version: 3.6.1 +Release: 3%{?dist} +Summary: Eclipse Git Integration + License: EPL URL: http://www.eclipse.org/egit -Group: Development/Tools Source0: http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{version}.%{version_suffix}.tar.bz2 +%if %{bootstrap} +Patch0: remove-mylyn-dep.patch +%endif -BuildRequires: %{maven_scl_prefix}maven-local -BuildRequires: java-1.7.0-openjdk-devel >= 1.7.0 -BuildRequires: %{?scl_prefix}eclipse-jgit >= 3.3.2 -BuildRequires: %{?scl_prefix}jgit >= 1.3.0 -BuildRequires: tycho +BuildRequires: %{?scl_prefix}tycho +BuildRequires: %{?scl_prefix}eclipse-jgit >= 3.5.3-1 +%if ! %{bootstrap} BuildRequires: %{?scl_prefix}eclipse-mylyn-context-team BuildRequires: %{?scl_prefix}eclipse-mylyn-docs-wikitext +%endif + Requires: %{?scl_prefix}eclipse-platform >= 1:3.5.0 -Requires: %{?scl_prefix}eclipse-jgit >= 3.3.2 -%{?scl:Requires: %scl_runtime} +Requires: %{?scl_prefix}eclipse-jgit >= 3.5.3-1 BuildArch: noarch @@ -31,108 +36,148 @@ BuildArch: noarch The eclipse-egit package contains Eclipse plugins for interacting with Git repositories. - +%if ! %{bootstrap} %package mylyn Summary: Git integration for mylyn. Requires: %{?scl_prefix}eclipse-mylyn-context-team Requires: %{?scl_prefix}eclipse-egit = %{version}-%{release} Requires: %{?scl_prefix}eclipse-mylyn-docs-wikitext -Group: Development/Tools %description mylyn Git integration for mylyn. +%endif %prep -%setup -n egit-%{version}.%{version_suffix} -q +%setup -q -n egit-%{version}.%{version_suffix} +%if %{bootstrap} +%patch0 +%endif +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} %pom_xpath_remove "pom:repositories" %pom_xpath_remove "pom:dependencies" %pom_xpath_remove "pom:profiles" %pom_xpath_remove "pom:build/pom:plugins/pom:plugin/pom:configuration/pom:target" %pom_xpath_remove "*[local-name() ='plugin' and (child::*[text()='tycho-packaging-plugin'])]" %pom_xpath_remove "pom:dependencies" org.eclipse.egit.doc/pom.xml +%pom_disable_module org.eclipse.egit.repository +%pom_disable_module org.eclipse.egit.source-feature %pom_disable_module org.eclipse.egit.target %pom_disable_module org.eclipse.egit.core.test %pom_disable_module org.eclipse.egit.ui.test %pom_disable_module org.eclipse.egit.mylyn.ui.test -#TODO: revisit jgit packaging and maybe package source? -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 +%if %{bootstrap} +#to avoid mylyn circular dependancy +%pom_disable_module org.eclipse.egit.mylyn.ui +%pom_disable_module org.eclipse.egit.mylyn-feature +%else +%endif -# 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 +%if ! %{bootstrap} +%mvn_package :*mylyn* mylyn +%endif +%mvn_package :* egit +%{?scl:EOF} %build -scl enable %{scl} - <<"EOF" -xmvn -o clean verify -Dmaven.test.skip=true -EOF +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build -j -f +%{?scl:EOF} %install -install -d -m 755 $RPM_BUILD_ROOT%{install_loc} -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse/features -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/eclipse/plugins - -unzip -q -d $RPM_BUILD_ROOT%{install_loc}/eclipse org.eclipse.egit.repository/target/org.eclipse.egit.repository-%{version}.*-r.zip -pushd $RPM_BUILD_ROOT%{install_loc}/eclipse/features - for f in * ; do - f_name=${f/.jar//} - mkdir -p $f_name - unzip -d $f_name $f - rm $f - done -popd -rm $RPM_BUILD_ROOT%{install_loc}/eclipse/*.jar - -%files -%dir %{install_loc} -%dir %{install_loc}/eclipse -%dir %{install_loc}/eclipse/plugins -%dir %{install_loc}/eclipse/features -%{install_loc}/eclipse/features/org.eclipse.egit_* -%{install_loc}/eclipse/plugins/ -%exclude %{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install +%{?scl:EOF} + +%files -f .mfiles-egit %doc LICENSE README.md -%files mylyn -%{install_loc}/eclipse/features/org.eclipse.egit.mylyn_* -%{install_loc}/eclipse/plugins/org.eclipse.egit.mylyn.ui_*.jar +%if ! %{bootstrap} +%files mylyn -f .mfiles-mylyn +%doc LICENSE README.md +%endif %changelog -* Tue Jul 1 2014 Alexander Kurtakov 3.4.1-1 -- Update to 3.4.1. +* Fri Jan 16 2015 Roland Grunberg - 3.6.1-3 +- Build non-bootstrapped. + +* Wed Jan 14 2015 Roland Grunberg - 3.6.1-2 +- SCL-ize. + +* Mon Jan 5 2015 Alexander Kurtakov 3.6.1-1 +- Update to upstream 3.6.1 release. + +* Fri Dec 19 2014 Alexander Kurtakov 3.5.3-1 +- Update to upstream 3.5.3 release. + +* Thu Dec 18 2014 Alexander Kurtakov 3.5.2-1 +- Update to upstream 3.5.2 release. -* Tue May 27 2014 Alexander Kurtakov 3.3.2-2 -- Reenable mylyn subpackage. +* Fri Nov 07 2014 Mat Booth - 3.5.0-2 +- Build/install with mvn_build/mvn_install + +* Fri Oct 03 2014 Mat Booth - 3.5.0-1 +- Update to latest upstream release 3.5.0 + +* 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. + +* Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Thu May 22 2014 Sami Wagiaalla - 3.3.2-2 -- Build for DTS 3 - Fix build agains the lates o.e.jface.util.Policy. -* Tue Oct 8 2013 Krzysztof Daniel 3.1.0-2 -- Add missing BR. +* Mon Apr 28 2014 Mat Booth - 3.3.2-1 +- Update to 3.3.2. + +* Fri Mar 28 2014 Alexander Kurtakov 3.3.1-1 +- Update to 3.3.1. + +* Tue Mar 11 2014 Alexander Kurtakov 3.3.0-1 +- Update to 3.3.0. -* Tue Oct 8 2013 Krzysztof Daniel 3.1.0-1 -- Update to Kepler SR1 release (RHBZ#1015996). +* Sun Dec 29 2013 Alexander Kurtakov 3.2.0-1 +- Update to 3.2.0. -* Fri Mar 8 2013 Sami Wagiaalla 2.3.1-1 -- Add epoch to java-devel BR. +* Mon Oct 21 2013 Krzysztof Daniel 3.1.0-3 +- Fix feature installation. -* Thu Mar 7 2013 Sami Wagiaalla 2.3.1-1 -- Update to 2.3.1 release. +* Wed Oct 16 2013 Krzysztof Daniel 3.1.0-2 +- Package Egit integration for mylyn. +- Changed building process to reflect upstream one. -* Thu Jan 10 2013 Sami Wagiaalla 2.2.0-1 -- Update to 2.2.0 release. +* Thu Oct 3 2013 Krzysztof Daniel 3.1.0-1 +- Update to Kepler SR1. -* Thu Dec 13 2012 Krzysztof Daniel 2.1.0-3 -- Drop the ExclusiveArch. -- Fix the installation location. +* Sat Aug 03 2013 Fedora Release Engineering - 3.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Tue Dec 4 2012 Alexander Kurtakov 2.1.0-2 +* Fri Jul 5 2013 Neil Brian Guzman 3.0.0-3 +- Bump release + +* Tue Jun 25 2013 Neil Brian Guzman 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jun 25 2013 Krzysztof Daniel 3.0.0-1 +- Update to 3.0.0. + +* Thu Feb 21 2013 Sami Wagiaalla 2.3.1-1 - SCL-ized. +* Thu Feb 21 2013 Sami Wagiaalla 2.3.1-1 +- Update to 2.3.1. + +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jan 3 2013 Krzysztof Daniel 2.2.0-1 +- Update to latest upstream. + * Mon Oct 1 2012 Alexander Kurtakov 2.1.0-1 - Update to 2.1.0 release.