From 90849dc4a1816ab681249b5b629f3a971a93b699 Mon Sep 17 00:00:00 2001 From: William Benton Date: Mar 05 2014 15:39:56 +0000 Subject: removed bouncycastle deps for rawhide --- diff --git a/sbt b/sbt old mode 100744 new mode 100755 diff --git a/sbt.spec b/sbt.spec index 9e126e5..f2ba9fc 100644 --- a/sbt.spec +++ b/sbt.spec @@ -451,17 +451,17 @@ sed -i -e 's/0.13.0/%{sbt_bootstrap_version}/g' project/build.properties # is source and binary incompatible with 2.3.0-rc1 (which upstream sbt # 0.13.1 is built against) -./climbing-nemesis.py org.apache.ivy ivy %{ivy_local_dir} --version 2.3.0-rc1 --pomfile %{SOURCE18} --jarfile %{SOURCE19} --extra-dep org.bouncycastle:bcpg-jdk16:1.46 --extra-dep org.bouncycastle:bcprov-jdk16:1.46 +./climbing-nemesis.py org.apache.ivy ivy %{ivy_local_dir} --version 2.3.0-rc1 --pomfile %{SOURCE18} --jarfile %{SOURCE19} # --extra-dep org.bouncycastle:bcpg-jdk16:1.46 --extra-dep org.bouncycastle:bcprov-jdk16:1.46 %endif # we're building against Ivy 2.3.0, though -./climbing-nemesis.py org.apache.ivy ivy %{ivy_local_dir} --version 2.3.0 --pomfile %{SOURCE20} --jarfile %{_javadir}/ivy.jar --extra-dep org.bouncycastle:bcpg-jdk16:1.46 --extra-dep org.bouncycastle:bcprov-jdk16:1.46 +./climbing-nemesis.py org.apache.ivy ivy %{ivy_local_dir} --version 2.3.0 --pomfile %{SOURCE20} --jarfile %{_javadir}/ivy.jar # --extra-dep org.bouncycastle:bcpg-jdk16:1.46 --extra-dep org.bouncycastle:bcprov-jdk16:1.46 ## BEGIN OPTIONAL IVY DEPS # bouncycastle pgp signature generator -./climbing-nemesis.py org.bouncycastle bcpg-jdk16 %{ivy_local_dir} --version 1.46 -./climbing-nemesis.py org.bouncycastle bcprov-jdk16 %{ivy_local_dir} --version 1.46 +# ./climbing-nemesis.py org.bouncycastle bcpg-jdk16 %{ivy_local_dir} --version 1.46 +# ./climbing-nemesis.py org.bouncycastle bcprov-jdk16 %{ivy_local_dir} --version 1.46 # ORO (blast from the past) ./climbing-nemesis.py oro oro %{ivy_local_dir} --version 2.0.8