[eclipse-egit] - Package Egit integration for mylyn. - Changed building process to reflect upstream one.
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Oct 16 11:14:43 UTC 2013
commit bd64c574a39327f04a2dd734be0dfcafe58126cd
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Oct 16 13:14:35 2013 +0200
- Package Egit integration for mylyn.
- Changed building process to reflect upstream one.
eclipse-egit.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 7 deletions(-)
---
diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 4bab98a..7c6c560 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -7,16 +7,19 @@
Summary: Eclipse Git Integration
Name: %{?scl_prefix}eclipse-egit
Version: 3.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
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
BuildRequires: java-devel >= 1.6.0
-BuildRequires: %{?scl_prefix}eclipse-pde
BuildRequires: %{?scl_prefix}eclipse-jgit >= 1.3.0
+BuildRequires: %{?scl_prefix}jgit >= 1.3.0
BuildRequires: jpackage-utils >= 0:1.5
+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 >= 1.3.0
%{?scl:Requires: %scl_runtime}
@@ -24,26 +27,66 @@ Requires: %{?scl_prefix}eclipse-jgit >= 1.3.0
BuildArch: noarch
%description
-The eclipse-egit package contains Eclipse plugins for
+The eclipse-egit package contains Eclipse plugins forcha
interacting with Git repositories.
+
+%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.
+
%prep
%setup -n egit-%{version}.%{version_suffix} -q
+%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.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
%build
-%{_bindir}/eclipse-pdebuild -f org.eclipse.egit -d "jgit"
+mvn-rpmbuild verify -Dmaven.test.skip=true
%install
install -d -m 755 $RPM_BUILD_ROOT%{install_loc}
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/features
+install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/plugins
-# egit main feature
-unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ build/rpmBuild/org.eclipse.egit.zip
+unzip -q -d $RPM_BUILD_ROOT%{install_loc}/ org.eclipse.egit.repository/target/org.eclipse.egit.repository-%{version}.*-r.zip
+rm $RPM_BUILD_ROOT%{install_loc}/*.jar
%files
-%{install_loc}
+%dir %{install_loc}
+%dir %{install_loc}/plugins
+%dir %{install_loc}/features
+%{install_loc}/features/org.eclipse.egit_*.jar
+%{install_loc}/plugins/
+%exclude %{install_loc}/plugins/org.eclipse.egit.mylyn.ui_*.jar
%doc LICENSE README.md
+%files mylyn
+%{install_loc}/features/org.eclipse.egit.mylyn_*.jar
+%{install_loc}/plugins/org.eclipse.egit.mylyn.ui_*.jar
+
%changelog
+* Wed Oct 16 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.1.0-2
+- Package Egit integration for mylyn.
+- Changed building process to reflect upstream one.
+
* Thu Oct 3 2013 Krzysztof Daniel <kdaniel at redhat.com> 3.1.0-1
- Update to Kepler SR1.
More information about the scm-commits
mailing list