[eclipse-jgit] Update to 3.0.0
Neil Brian Guzman
nguzman at fedoraproject.org
Thu Jun 20 14:32:02 UTC 2013
commit cdda44bb12418ace4ad465f719a41af9b5e0b0fc
Author: Neil Guzman <nguzman at redhat.com>
Date: Thu Jun 20 10:31:21 2013 -0400
Update to 3.0.0
eclipse-jgit.spec | 42 ++++++++++++++++++++++++++++++------------
sources | 2 +-
2 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index df4b930..4567b87 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,13 +1,13 @@
%global install_loc %{_datadir}/eclipse/dropins/jgit
-%global version_suffix 201302201838-r
+%global version_suffix 201306101825-r
%{?scl:%scl_package eclipse-jgit}
%{!?scl:%global pkg_name %{name}}
Name: %{?scl_prefix}eclipse-jgit
-Version: 2.3.1
-Release: 2%{?dist}
+Version: 3.0.0
+Release: 1%{?dist}
Summary: Eclipse JGit
Group: Development/Tools
@@ -34,6 +34,8 @@ BuildRequires: maven-shade-plugin
BuildRequires: args4j >= 2.0.12
BuildRequires: apache-commons-compress
BuildRequires: xz-java >= 1.1-2
+BuildRequires: javaewah
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
%{?scl:Requires: %scl_runtime}
Requires: %{?scl_prefix}eclipse-platform >= 3.5.0
@@ -56,6 +58,7 @@ Requires: java >= 1.6.0
Requires: apache-commons-compress
Requires: xz-java >= 1.1-2
Requires: jpackage-utils
+Requires: javaewah
%description -n %{?scl_prefix}jgit
Command line Git tool built entirely in Java.
@@ -68,14 +71,19 @@ sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
%patch0
-find . -name MANIFEST.MF -exec sed -i -e 's|7.6.0,8.0.0|7.6.0,8.6.0|g' {} \;
+find . -name MANIFEST.MF -exec sed -i -e 's|7.6.0,8.0.0|7.6.0,9.1.0|g' {} \;
+sed -i -e 's/javaewah;version="0.5.6"/com.googlecode.javaewah/g' org.eclipse.jgit/META-INF/MANIFEST.MF
+find -name *.java -exec sed -i -e "s/javaewah/com.googlecode.javaewah/g" {} \;
+sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml
sed -i -e 's|org.kohsuke.args4j|args4j|g' org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+
%build
mkdir -p deps/plugins
pushd deps/
- ln -s %{_javadir}/commons-compress.jar
- ln -s %{_javadir}/xz-java.jar
- ln -s %{_javadir}/args4j.jar
+ ln -s %{_javadir}/commons-compress.jar
+ ln -s %{_javadir}/xz-java.jar
+ ln -s %{_javadir}/args4j.jar
+ ln -s %{_javadir}/javaewah/JavaEWAH.jar
popd
# build plugin
@@ -83,7 +91,7 @@ popd
# build JARs
%{?scl:%scl_maven_opts}
mvn-rpmbuild -Dtranslate-qualifier=true install \
- -pl "org.eclipse.jgit,org.eclipse.jgit.ui,org.eclipse.jgit.console,org.eclipse.jgit.pgm"
+ -pl "org.eclipse.jgit,org.eclipse.jgit.ui,org.eclipse.jgit.java7,org.eclipse.jgit.console,org.eclipse.jgit.pgm"
%install
install -d -m 755 %{buildroot}%{install_loc}
@@ -91,16 +99,19 @@ install -d -m 755 %{buildroot}%{install_loc}
%{__unzip} -q -d %{buildroot}%{install_loc} \
build/rpmBuild/org.eclipse.jgit.zip
pushd %{buildroot}%{install_loc}/eclipse/plugins
- rm com.jcraft.jsch_*.jar
- ln -s %{_javadir}/args4j.jar
- ln -s %{_javadir}/commons-compress.jar
- ln -s %{_javadir}/xz-java.jar
+ rm com.jcraft.jsch_*.jar
+ rm com.googlecode.javaewah.JavaEWAH_*.jar
+ ln -s %{_javadir}/args4j.jar
+ ln -s %{_javadir}/commons-compress.jar
+ ln -s %{_javadir}/xz-java.jar
+ ln -s %{_javadir}/javaewah/JavaEWAH.jar
popd
# JARs
install -d -m 0755 %{buildroot}%{_javadir}/jgit
install -m 644 org.eclipse.jgit/target/org.eclipse.jgit-%{version}.%{version_suffix}.jar %{buildroot}%{_javadir}/jgit/jgit.jar
install -m 644 org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-%{version}.%{version_suffix}.jar %{buildroot}%{_javadir}/jgit/ui.jar
+install -m 644 org.eclipse.jgit.java7/target/org.eclipse.jgit.java7-%{version}.%{version_suffix}.jar %{buildroot}%{_javadir}/jgit/java7.jar
install -m 644 org.eclipse.jgit.console/target/org.eclipse.jgit.console-%{version}.%{version_suffix}.jar %{buildroot}%{_javadir}/jgit/console.jar
install -m 644 org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-%{version}.%{version_suffix}.jar %{buildroot}%{_javadir}/jgit/pgm.jar
# Javadocs
@@ -113,11 +124,13 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-jgit-parent.pom
install -pm 644 org.eclipse.jgit/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-jgit.pom
install -pm 644 org.eclipse.jgit.ui/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-ui.pom
+install -pm 644 org.eclipse.jgit.java7/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-java7.pom
install -pm 644 org.eclipse.jgit.console/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-console.pom
install -pm 644 org.eclipse.jgit.pgm/pom.xml %{buildroot}%{_mavenpomdir}/JPP.jgit-pgm.pom
%add_maven_depmap JPP.jgit-jgit.pom jgit/jgit.jar
%add_maven_depmap JPP.jgit-ui.pom jgit/ui.jar
+%add_maven_depmap JPP.jgit-java7.pom jgit/java7.jar
%add_maven_depmap JPP.jgit-console.pom jgit/console.jar
%add_maven_depmap JPP.jgit-pgm.pom jgit/pgm.jar
%add_maven_depmap JPP-jgit-parent.pom
@@ -132,6 +145,7 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
%exclude %{install_loc}/eclipse/plugins/args4j.jar
%exclude %{install_loc}/eclipse/plugins/commons-compress.jar
%exclude %{install_loc}/eclipse/plugins/xz-java.jar
+%exclude %{install_loc}/eclipse/plugins/JavaEWAH.jar
%files -n %{?scl_prefix}jgit
%{_bindir}/jgit
@@ -142,6 +156,7 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
%{install_loc}/eclipse/plugins/args4j.jar
%{install_loc}/eclipse/plugins/commons-compress.jar
%{install_loc}/eclipse/plugins/xz-java.jar
+%{install_loc}/eclipse/plugins/JavaEWAH.jar
%doc LICENSE
%doc README.md
@@ -151,6 +166,9 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit
%doc README.md
%changelog
+* Thu Jun 20 2013 Neil Brian Guzman <nguzman at redhat.com> 3.0.0-1
+- Update to 3.0.0 release
+
* Tue May 14 2013 Krzysztof Daniel <kdaniel at redhat.com> 2.3.1-2
- Rebuild with latest icu4j.
diff --git a/sources b/sources
index f3bb253..4f9a5c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9d426dc032a7a61dff7cb416f2824e2f jgit-2.3.1.201302201838-r.tar.bz2
+76991f2a3445930cb10c80118345a9a4 jgit-3.0.0.201306101825-r.tar.bz2
More information about the scm-commits
mailing list