From 10a5046056990177a9588e7adb53468a21a0f7c5 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Jun 25 2013 10:45:59 +0000 Subject: - Move symlinks to eclipse-jgit. - Fix jgit classpath. --- diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index 4567b87..27eda36 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -7,7 +7,7 @@ Name: %{?scl_prefix}eclipse-jgit Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eclipse JGit Group: Development/Tools @@ -80,6 +80,7 @@ sed -i -e 's|org.kohsuke.args4j|args4j|g' org.eclipse.jgit.packaging/org.eclipse %build mkdir -p deps/plugins pushd deps/ + #to the future maintainers - don't forget to add those jars to the fix_jgit_sh.patch ln -s %{_javadir}/commons-compress.jar ln -s %{_javadir}/xz-java.jar ln -s %{_javadir}/args4j.jar @@ -142,10 +143,6 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit %doc LICENSE %doc README.md %{install_loc} -%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 @@ -153,10 +150,6 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit %{_mavendepmapfragdir}/%{name} %{_mavenpomdir}/JPP-jgit-parent.pom %{_mavenpomdir}/JPP.jgit*.pom -%{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 @@ -166,6 +159,10 @@ install -m 755 org.eclipse.jgit.pgm/jgit.sh %{buildroot}%{_bindir}/jgit %doc README.md %changelog +* Tue Jun 25 2013 Krzysztof Daniel 3.0.0-2 +- Move symlinks to eclipse-jgit. +- Fix jgit classpath. + * Thu Jun 20 2013 Neil Brian Guzman 3.0.0-1 - Update to 3.0.0 release diff --git a/fix_jgit_sh.patch b/fix_jgit_sh.patch index f72bdfe..c519dbe 100644 --- a/fix_jgit_sh.patch +++ b/fix_jgit_sh.patch @@ -5,7 +5,7 @@ [ $? -gt 0 -a -f "$0" ] && this_script="$0" cp=$this_script - -+export JGIT_CLASSPATH="/usr/share/java/jgit/*:/usr/share/java/args4j.jar:/usr/share/java/jsch.jar" ++export JGIT_CLASSPATH="/usr/share/java/jgit/*:/usr/share/java/args4j.jar:/usr/share/java/jsch.jar:/usr/share/java/commons-compress.jar:/usr/share/java/xz-java.jar:/usr/share/java/javaewah/JavaEWAH.jar" if [ -n "$JGIT_CLASSPATH" ] then cp="$cp:$JGIT_CLASSPATH"