diff --git a/.devtoolset-3-eclipse-jgit.metadata b/.devtoolset-3-eclipse-jgit.metadata index 0781b8d..db25216 100644 --- a/.devtoolset-3-eclipse-jgit.metadata +++ b/.devtoolset-3-eclipse-jgit.metadata @@ -1 +1 @@ -9d1982902f9c7b5163b5c37807eabfffd8f564a3 SOURCES/jgit-3.4.1.201406201815-r.tar.bz2 +aa737865a9d49621618f2f042dfc699048b7ef82 SOURCES/jgit-3.6.1.201501031845-r.tar.bz2 diff --git a/.gitignore b/.gitignore index 4f873e5..617d281 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jgit-3.4.1.201406201815-r.tar.bz2 +SOURCES/jgit-3.6.1.201501031845-r.tar.bz2 diff --git a/SOURCES/eclipse-jgit-413163.patch b/SOURCES/eclipse-jgit-413163.patch index a5597b2..b6186ac 100644 --- a/SOURCES/eclipse-jgit-413163.patch +++ b/SOURCES/eclipse-jgit-413163.patch @@ -1,4 +1,4 @@ -From db03b9787cb8c71d9c035a628ecae17581bcc390 Mon Sep 17 00:00:00 2001 +From 964fdccf525e3be7eaf77747a0326920a84e67e4 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Thu, 18 Jul 2013 19:08:29 +0200 Subject: [PATCH] Fix compilation errors with args4j 2.0.23 and later @@ -12,6 +12,7 @@ Bug: 413163 Change-Id: I4bb951e9fab5f4ae4271bd7e11be799dc234ab80 --- .../tst/org/eclipse/jgit/pgm/RmTest.java | 80 ++++++++++++++++++++++ + .../src/org/eclipse/jgit/pgm/Checkout.java | 2 +- .../src/org/eclipse/jgit/pgm/Daemon.java | 8 +-- .../src/org/eclipse/jgit/pgm/Diff.java | 2 +- .../src/org/eclipse/jgit/pgm/DiffTree.java | 2 +- @@ -19,9 +20,11 @@ Change-Id: I4bb951e9fab5f4ae4271bd7e11be799dc234ab80 .../org/eclipse/jgit/pgm/RevWalkTextBuiltin.java | 2 +- .../src/org/eclipse/jgit/pgm/Rm.java | 4 +- .../src/org/eclipse/jgit/pgm/Show.java | 2 +- + .../src/org/eclipse/jgit/pgm/Status.java | 2 +- .../org/eclipse/jgit/pgm/debug/DiffAlgorithms.java | 4 +- .../eclipse/jgit/pgm/debug/TextHashFunctions.java | 6 +- - 10 files changed, 95 insertions(+), 17 deletions(-) + .../org/eclipse/jgit/pgm/opt/CmdLineParser.java | 3 +- + 13 files changed, 98 insertions(+), 21 deletions(-) create mode 100644 org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RmTest.java diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RmTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RmTest.java @@ -110,6 +113,19 @@ index 0000000..00a1a9a + assertFalse(b.exists()); + } +} +diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +index 8f911fd..e424bf7 100644 +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +@@ -75,7 +75,7 @@ + private String name; + + @Argument(index = 1) +- @Option(name = "--", metaVar = "metaVar_paths", multiValued = true, handler = StopOptionHandler.class) ++ @Option(name = "--", metaVar = "metaVar_paths", handler = StopOptionHandler.class) + private List paths = new ArrayList(); + + @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java index 04182d6..9ef8e49 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -149,10 +165,10 @@ index 8f05168..3db8ce2 100644 // BEGIN -- Options shared with Log diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java -index 018bad0..ec23f11 100644 +index d89053c..90d7c06 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java -@@ -68,7 +68,7 @@ void tree_0(final AbstractTreeIterator c) { +@@ -69,7 +69,7 @@ void tree_0(final AbstractTreeIterator c) { @Argument(index = 1, metaVar = "metaVar_treeish", required = true) private final List trees = new ArrayList(); @@ -162,10 +178,10 @@ index 018bad0..ec23f11 100644 @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java -index 4fb560b..0110935 100644 +index 4b16ed8..4da8e09 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java -@@ -65,7 +65,7 @@ +@@ -67,7 +67,7 @@ private AbstractTreeIterator tree; @Argument(index = 1) @@ -175,10 +191,10 @@ index 4fb560b..0110935 100644 @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java -index 4327403..ba0493a 100644 +index d6063c3..a223587 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java -@@ -124,7 +124,7 @@ void enableBoundary(final boolean on) { +@@ -126,7 +126,7 @@ void enableBoundary(final boolean on) { @Argument(index = 0, metaVar = "metaVar_commitish") private final List commits = new ArrayList(); @@ -218,11 +234,24 @@ index a33a2d4..bcff628 100644 protected TreeFilter pathFilter = TreeFilter.ALL; // BEGIN -- Options shared with Diff +diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +index 2ae950b..0bab32e 100644 +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +@@ -75,7 +75,7 @@ + @Option(name = "--porcelain", usage = "usage_machineReadableOutput") + protected boolean porcelain; + +- @Option(name = "--", metaVar = "metaVar_path", multiValued = true) ++ @Option(name = "--", metaVar = "metaVar_path") + protected List filterPaths; + + @Override diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java -index 3efe884..af3915b 100644 +index 91b5917..ed2818d 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java -@@ -109,13 +109,13 @@ DiffAlgorithm create() { +@@ -111,13 +111,13 @@ DiffAlgorithm create() { // // @@ -239,10 +268,10 @@ index 3efe884..af3915b 100644 @Option(name = "--count", metaVar = "LIMIT", usage = "Number of file revisions to be compared") diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java -index e43c9a6..274a89c 100644 +index 4205140..72425f1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java -@@ -248,16 +248,16 @@ public int fold(int hash, int bits) { +@@ -250,16 +250,16 @@ public int fold(int hash, int bits) { // // @@ -262,17 +291,20 @@ index e43c9a6..274a89c 100644 List gitDirs = new ArrayList(); @Override --- -1.8.3.1 ---- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java.bak 2013-10-03 10:47:24.000000000 +0200 -+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java 2013-10-03 10:57:14.418101625 +0200 -@@ -184,8 +184,7 @@ +diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +index 3f77aa6..b5d8d48 100644 +--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java ++++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +@@ -184,8 +184,7 @@ public RevWalk getRevWalkGently() { static class MyOptionDef extends OptionDef { public MyOptionDef(OptionDef o) { - super(o.usage(), o.metaVar(), o.required(), o.handler(), o - .isMultiValued()); -+ super(o.usage(), o.metaVar(), o.required(), o.hidden(), o.handler(), o.isMultiValued()); ++ super(o.usage(), o.metaVar(), o.required(), o.help(), o.hidden(), o.handler(), o.isMultiValued()); } @Override +-- +2.1.0 + diff --git a/SOURCES/fix_category.patch b/SOURCES/fix_category.patch deleted file mode 100644 index 9928e25..0000000 --- a/SOURCES/fix_category.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml.sav 2014-03-03 01:26:54.000000000 +0200 -+++ org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml 2014-03-10 17:45:40.762278933 +0200 -@@ -6,24 +6,12 @@ - - - -- -- -- - - - -- -- -- -- -- -- - - - -- -- -- - - - JGit diff --git a/SOURCES/java7module.patch b/SOURCES/java7module.patch deleted file mode 100644 index 4c5a652..0000000 --- a/SOURCES/java7module.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- pom.xml.sav 2014-03-28 16:03:13.323171797 +0200 -+++ pom.xml 2014-03-28 16:03:49.204259024 +0200 -@@ -503,7 +503,7 @@ - - jgit.java6 - -- 1.6 -+ [1.6,) - - - org.eclipse.jgit.console -@@ -512,10 +512,9 @@ - - jgit.java7 - -- 1.7 -+ [1.7,) - - -- org.eclipse.jgit.console - org.eclipse.jgit.java7 - org.eclipse.jgit.java7.test - diff --git a/SPECS/eclipse-jgit.spec b/SPECS/eclipse-jgit.spec index 7cdedd5..426848e 100644 --- a/SPECS/eclipse-jgit.spec +++ b/SPECS/eclipse-jgit.spec @@ -1,80 +1,45 @@ -%global install_loc %{_datadir}/eclipse/dropins/jgit -%global version_suffix 201406201815-r +%global version_suffix 201501031845-r %{?scl:%scl_package eclipse-jgit} %{!?scl:%global pkg_name %{name}} -%{!?maven_scl:%global maven_scl_prefix %{nil}} - -# Use SCL-ized package on RHEL < 7 and base otherwise -%if 0%{?rhel} < 7 -%global base_or_scl %{?scl_prefix} -%else -%global base_or_scl %{nil} -%endif +%{?java_common_find_provides_and_requires} Name: %{?scl_prefix}eclipse-jgit -Version: 3.4.1 -Release: 1%{?dist} +Version: 3.6.1 +Release: 3%{?dist} Summary: Eclipse JGit -Group: Development/Tools License: BSD URL: http://www.eclipse.org/egit/ Source0: http://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-%{version}.%{version_suffix}.tar.bz2 Patch0: fix_jgit_sh.patch Patch1: eclipse-jgit-413163.patch -Patch2: fix_category.patch -Patch3: java7module.patch BuildArch: noarch -BuildRequires: java-devel -BuildRequires: %{?scl_prefix}eclipse-pde >= 1:3.5.0 -BuildRequires: %{maven_scl_prefix}javapackages-tools -BuildRequires: %{maven_scl_prefix}maven-local -BuildRequires: %{maven_scl_prefix}maven-compiler-plugin -BuildRequires: %{maven_scl_prefix}maven-install-plugin -BuildRequires: %{maven_scl_prefix}maven-jar-plugin -BuildRequires: %{maven_scl_prefix}maven-javadoc-plugin -BuildRequires: %{maven_scl_prefix}maven-release-plugin -BuildRequires: %{maven_scl_prefix}maven-resources-plugin -BuildRequires: %{maven_scl_prefix}maven-surefire-plugin -BuildRequires: %{maven_scl_prefix}maven-surefire-provider-junit -BuildRequires: %{maven_scl_prefix}maven-shade-plugin -BuildRequires: tycho -BuildRequires: %{?scl_prefix}eclipse-equinox-osgi -BuildRequires: %{?scl_prefix}eclipse-platform +BuildRequires: %{?scl_prefix}eclipse-pde +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix_maven}maven-shade-plugin +BuildRequires: %{?scl_prefix}tycho BuildRequires: %{?scl_prefix}args4j >= 2.0.12 -BuildRequires: %{base_or_scl}apache-commons-compress -BuildRequires: %{base_or_scl}xz-java >= 1.1-2 +BuildRequires: %{?scl_prefix_java_common}apache-commons-compress +BuildRequires: %{?scl_prefix_java_common}xz-java >= 1.1-2 BuildRequires: %{?scl_prefix}javaewah -BuildRequires: %{maven_scl_prefix}mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: %{?scl_prefix}feclipse-maven-plugin >= 0.0.3 -%{?scl:Requires: %scl_runtime} -Requires: %{?scl_prefix}eclipse-platform >= 3.5.0 -Requires: %{?scl_prefix}javaewah -Requires: %{?scl_prefix}args4j -Requires: %{base_or_scl}apache-commons-compress -Requires: %{base_or_scl}xz-java >= 1.1-2 +Requires: %{?scl_prefix}eclipse-platform +Requires: %{?scl_prefix}jgit = %{version}-%{release} %description A pure Java implementation of the Git version control system. %package -n %{?scl_prefix}jgit-javadoc Summary: API documentation for %{pkg_name} -Group: Documentation %description -n %{?scl_prefix}jgit-javadoc %{summary}. %package -n %{?scl_prefix}jgit Summary: Java-based command line Git interface -Group: Development/Tools -Requires: %{?scl_prefix}args4j >= 2.0.12 -Requires: %{base_or_scl}apache-commons-compress -Requires: %{base_or_scl}xz-java >= 1.1-2 -Requires: %{?scl_prefix}javaewah %description -n %{?scl_prefix}jgit Command line Git tool built entirely in Java. @@ -82,136 +47,163 @@ Command line Git tool built entirely in Java. %prep %setup -n jgit-%{version}.%{version_suffix} -q -scl enable %{scl} - <<"EOF" %patch0 %patch1 -p1 -%patch2 -b .sav -%patch3 #javaewah change -sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml - -#don't try to get it from local *maven* repo, use tycho resolved one +sed -i -e "s/javaewah/com.googlecode.javaewah.JavaEWAH/g" org.eclipse.jgit.packaging/org.eclipse.jgit{,.pgm}.feature/feature.xml + +# See fix_jgit_sh.patch +sed -i 's|\(/usr/share/java/jgit/\*\)|%{?_scl_root}\1| + s|\(/usr/share/java/args4j\.jar\)|%{?_scl_prefix}%{?scl_java_common:/%{scl_java_common}/root}\1| + s|\(/usr/share/java/jsch\.jar\)|%{?_scl_prefix}%{?scl_java_common:/%{scl_java_common}/root}\1| + s|\(/usr/share/java/commons-compress\.jar\)|%{?_scl_prefix}%{?scl_java_common:/%{scl_java_common}/root}\1| + s|\(/usr/share/java/xz-java\.jar\)|%{?_scl_prefix}%{?scl_java_common:/%{scl_java_common}/root}\1| + s|\(/usr/share/java/javaewah/JavaEWAH\.jar\)|%{?_scl_root}\1| + ' org.eclipse.jgit.pgm/jgit.sh + +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +# Don't try to get deps from local *maven* repo, use tycho resolved ones %pom_remove_dep com.googlecode.javaewah:JavaEWAH -%pom_remove_dep org.eclipse.jgit:org.eclipse.jgit.junit.http org.eclipse.jgit.packaging/org.eclipse.jgit.repository +for p in $(find org.eclipse.jgit.packaging -name pom.xml) ; do + grep -q dependencies $p && %pom_xpath_remove "pom:dependencies" $p +done + +# Use Equinox OSGi instead of Felix +%pom_change_dep -r org.osgi:org.osgi.core org.eclipse.osgi:org.eclipse.osgi #those bundles don't compile with latest jetty %pom_disable_module org.eclipse.jgit.http.test %pom_disable_module org.eclipse.jgit.pgm.test %pom_disable_module org.eclipse.jgit.junit.http +%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging + +%pom_disable_module org.eclipse.jgit.ant.test +%pom_disable_module org.eclipse.jgit.java7.test +%pom_disable_module org.eclipse.jgit.test +# Don't need target platform or repository modules with xmvn %pom_disable_module org.eclipse.jgit.target org.eclipse.jgit.packaging +%pom_disable_module org.eclipse.jgit.repository org.eclipse.jgit.packaging %pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin/pom:configuration/pom:target" org.eclipse.jgit.packaging/pom.xml -%pom_disable_module org.eclipse.jgit.junit.feature org.eclipse.jgit.packaging -%pom_disable_module org.eclipse.jgit.pgm.feature org.eclipse.jgit.packaging +# Don't build source features +%pom_disable_module org.eclipse.jgit.source.feature org.eclipse.jgit.packaging %pom_disable_module org.eclipse.jgit.pgm.source.feature org.eclipse.jgit.packaging %pom_disable_module org.eclipse.jgit.http.apache.feature org.eclipse.jgit.packaging -sed -i -e 's/\, multiValued = true//' org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java -sed -i -e 's/\, multiValued = true//' org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +# Relax version restriction for javaewah sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit/META-INF/MANIFEST.MF sed -i -e 's/0.7.9,0.8.0/0.7.9,0.9.0/g' org.eclipse.jgit.test/META-INF/MANIFEST.MF -sed -i -e 's/o.hidden()/o.help(),o.hidden()/g' org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java + %pom_remove_plugin org.jacoco:jacoco-maven-plugin -EOF + +# Don't attach shell script artifact +%pom_remove_plugin org.codehaus.mojo:build-helper-maven-plugin org.eclipse.jgit.pgm +%{?scl:EOF} %build -scl enable %{scl} - <<"EOF" -mvn-rpmbuild -Dmaven.test.skip=true install -mvn-rpmbuild -Dmaven.test.skip=true -f org.eclipse.jgit.packaging/pom.xml verify -EOF +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +# Due to a current limitation of Tycho it is not possible to mix pom-first and +# manifest-first builds in the same reactor build hence two separate invocations + +# First invocation installs jgit so the second invocation will succeed +%mvn_build -f --post install:install \ + -- -Dmaven.repo.local=$(pwd)/org.eclipse.jgit.packaging/.m2 + +# Second invocation builds the eclipse features +pushd org.eclipse.jgit.packaging +%mvn_build -j -f -- -Dfedora.p2.repos=$(pwd)/.m2 +popd +%{?scl:EOF} %install -scl enable %{scl} - <<"EOF" -install -d -m 755 %{buildroot}%{install_loc} - -mvn-rpmbuild org.fedoraproject:feclipse-maven-plugin:install \ - -DsourceRepo=`pwd`/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository \ - -DtargetLocation=%{buildroot}%{install_loc}/eclipse - -pushd %{buildroot}%{install_loc}/eclipse/plugins - rm com.jcraft.jsch_*.jar - rm com.googlecode.javaewah.JavaEWAH_*.jar - rm org.apache.commons.compress_*.jar -#to the future maintainers - dont forget to add those jars to the fix_jgit_sh.patch - ln -s %{_javadir}/args4j.jar -%if 0%{?rhel} < 7 - ln -s %{_javadir}/commons-compress.jar - ln -s %{_javadir}/xz-java.jar -%else - ln -s %{_root_datadir}/java/commons-compress.jar - ln -s %{_root_datadir}/java/xz-java.jar -%endif - ln -s %{_javadir}/javaewah/JavaEWAH.jar +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} + +#%%mvn_artifact pom.xml +#for mod in org.eclipse.jgit{,.ant,.archive,.console,.http.{apache,server},.java7,.junit,.pgm,.ui}; do +# jarPath=`find $mod -name $mod-*.jar | grep -vE "(sources|javadoc)"` +# %%mvn_artifact -Dtype=eclipse-plugin $mod/pom.xml $jarPath +#done + +# The macro does not allow us to change the "namespace" value, but here we want to +# set it to something other than the SRPM name, so explode the macro +xmvn-install -R .xmvn-reactor -n jgit -d %{buildroot} +install -dm755 %{buildroot}%{_javadocdir}/jgit +cp -pr .xmvn/apidocs/* %{buildroot}%{_javadocdir}/jgit +echo '%{_javadocdir}/jgit' >>.mfiles-javadoc + +pushd org.eclipse.jgit.packaging +%mvn_install popd +%{?scl:EOF} -#giant hack - for some reason source bundle is in the repo, install the proper one -cp org.eclipse.jgit/target/org.eclipse.jgit-*-r.jar %{buildroot}%{install_loc}/eclipse/plugins - -# 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 -install -d -m 755 %{buildroot}%{_javadocdir}/jgit -cp -rp org.eclipse.jgit/target/apidocs %{buildroot}%{_javadocdir}/jgit -cp -rp org.eclipse.jgit.ui/target/apidocs %{buildroot}%{_javadocdir}/jgit -cp -rp org.eclipse.jgit.console/target/apidocs %{buildroot}%{_javadocdir}/jgit -# POM Files -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 # Binary install -dm 755 %{buildroot}%{_bindir} install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit -EOF -%files -%doc LICENSE -%doc README.md -%{install_loc} +for mod in org.eclipse.jgit{,.ant,.archive,.console,.http.{apache,server},.java7,.junit,.pgm,.ui}; do + ln -s %{_javadir}/jgit/${mod}.jar %{buildroot}%{_datadir}/eclipse/dropins/jgit/eclipse/plugins +done + +%files -f org.eclipse.jgit.packaging/.mfiles +%{_datadir}/eclipse/dropins/jgit/eclipse/plugins/* +%doc LICENSE README.md -%files -n %{?scl_prefix}jgit +%files -n %{?scl_prefix}jgit -f .mfiles %{_bindir}/jgit -%{_javadir}/jgit -%{_mavendepmapfragdir}/%{pkg_name} -%{_mavenpomdir}/JPP-jgit-parent.pom -%{_mavenpomdir}/JPP.jgit*.pom -%doc LICENSE -%doc README.md - -%files -n %{?scl_prefix}jgit-javadoc -%{_javadocdir}/jgit -%doc LICENSE -%doc README.md +%dir %{_javadir}/jgit +%dir %{_mavenpomdir}/jgit +%doc LICENSE README.md + +%files -n %{?scl_prefix}jgit-javadoc -f .mfiles-javadoc +%doc LICENSE README.md %changelog -* Mon Jun 30 2014 Alexander Kurtakov 3.4.1-1 -- Update to upstream 3.4.1 release. +* Fri Jan 16 2015 Roland Grunberg - 3.6.1-3 +- Use Equinox OSGi instead of Felix. +- Manually provide JGit jars in dropins. + +* 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. + +* 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 Nov 11 2014 Mat Booth - 3.5.0-3 +- Rebuild to generate correct symlinks +- Drop unnecessary requires (now autogenerated by xmvn) + +* Fri Nov 07 2014 Mat Booth - 3.5.0-2 +- Build/install eclipse plugin 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 +- Drop unnecessary BRs + +* Fri Jun 13 2014 Alexander Kurtakov 3.4.0-1 +- Update to upstream 3.4.0. + +* Sat Jun 07 2014 Fedora Release Engineering - 3.3.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Tue Jun 3 2014 Alexander Kurtakov 3.3.2-3.2 -- Add missing R on args4j. +* Fri May 30 2014 Mikolaj Izdebski - 3.3.2-5 +- Use .mfiles geterated during build -* Wed May 28 2014 Roland Grunberg - 3.3.2-3.1 -- Fix symlink paths. +* Fri May 30 2014 Alexander Kurtakov 3.3.2-4 +- Add missing Rs ( rhbz #1079706 ). -* Wed May 28 2014 Alexander Kurtakov 3.3.2-2.1 -- Add sclized Rs as auto-reqs are not working on RHEL 6. +* Wed May 28 2014 Alexander Kurtakov 3.3.2-3 +- Rebuild for latest commons-compress. * Wed May 21 2014 Alexander Kurtakov 3.3.2-2 - Fix compile against latest args4j.