From 866313d4f250c9fc3859fd0c2c83f5434870bb6b Mon Sep 17 00:00:00 2001 From: William Benton Date: Jul 11 2015 02:54:45 +0000 Subject: bootstrap build for Rawhide --- diff --git a/.gitignore b/.gitignore index 32d3cc0..fc05bf4 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,52 @@ /v0.3.0.tar.gz /v0.5.1.tar.gz /v0.6.3.tar.gz +/actions-0.13.1-ivy.xml +/api-0.13.1-ivy.xml +/apply-macro-0.13.1-ivy.xml +/cache-0.13.1-ivy.xml +/classfile-0.13.1-ivy.xml +/classpath-0.13.1-ivy.xml +/climbing-nemesis.py +/collections-0.13.1-ivy.xml +/command-0.13.1-ivy.xml +/compile-0.13.1-ivy.xml +/compiler-integration-0.13.1-ivy.xml +/compiler-interface-bin-0.13.1-ivy.xml +/compiler-interface-src-0.13.1-ivy.xml +/compiler-ivy-integration-0.13.1-ivy.xml +/completion-0.13.1-ivy.xml +/control-0.13.1-ivy.xml +/cross-0.13.1-ivy.xml +/datatype-generator-0.13.1-ivy.xml +/incremental-compiler-0.13.1-ivy.xml +/interface-0.13.1-ivy.xml +/io-0.13.1-ivy.xml +/ivy-0.13.1-ivy.xml +/ivy-2.3.0.pom +/ivy-2.3.0-rc1.pom +/launcher-0.13.1-ivy.xml +/launcher-interface-0.13.1-ivy.xml +/logging-0.13.1-ivy.xml +/main-0.13.1-ivy.xml +/main-settings-0.13.1-ivy.xml +/persist-0.13.1-ivy.xml +/precompiled-2_8_2-0.13.1-ivy.xml +/precompiled-2_9_2-0.13.1-ivy.xml +/precompiled-2_9_3-0.13.1-ivy.xml +/process-0.13.1-ivy.xml +/relation-0.13.1-ivy.xml +/rpmbuild-sbt.boot.properties +/run-0.13.1-ivy.xml +/sbt +/sbt-0.13.1-ivy.xml +/sbt.boot.properties +/sbt-launch-0.13.1-ivy.xml +/scripted-framework-0.13.1-ivy.xml +/scripted-plugin-0.13.1-ivy.xml +/scripted-sbt-0.13.1-ivy.xml +/tasks-0.13.1-ivy.xml +/task-system-0.13.1-ivy.xml +/test-agent-0.13.1-ivy.xml +/testing-0.13.1-ivy.xml +/tracking-0.13.1-ivy.xml diff --git a/sbt.spec b/sbt.spec index 6a4d758..f29ee3a 100644 --- a/sbt.spec +++ b/sbt.spec @@ -2,12 +2,12 @@ # bootstrap exception is here: https://fedorahosted.org/fpc/ticket/389 # meeting minutes with vote are here: http://meetbot.fedoraproject.org/fedora-meeting-1/2014-02-13/fpc.2014-02-13-17.00.html -%global do_bootstrap 0 +%global do_bootstrap 1 # build non-bootstrap packages with tests, cross-referenced sources, etc %global do_proper 0 -%global pkg_rel 6 -%global scala_version 2.10.3 +%global pkg_rel 7 +%global scala_version 2.10.4 %global scala_short_version 2.10 %global sbt_bootstrap_version 0.13.1 %global sbt_major 0 @@ -49,14 +49,11 @@ Name: sbt Version: %{sbt_version} -Release: %{pkg_rel}%{?dist}.1 +Release: %{pkg_rel}%{?dist} Summary: The simple build tool for Scala and Java projects BuildArch: noarch -# builds don't work on our ARM builders atm due to memory constraints -ExcludeArch: %{arm} - License: BSD URL: http://www.scala-sbt.org Source0: https://github.com/sbt/sbt/archive/v%{version}%{sbt_build}.tar.gz @@ -412,9 +409,6 @@ for props in rpmbuild-sbt.boot.properties sbt.boot.properties ; do sed -i -e 's/FEDORA_SBT_VERSION/%{sbt_version}/g' $props done -sed -i -e 's/["]2[.]10[.]2["]/\"2.10.3\"/g' $(find . -name \*.sbt) $(find . -name \*.xml) -sed -i -e 's/["]2[.]10[.]2-RC2["]/\"2.10.3\"/g' $(find . -name \*.sbt) - sed -i -e 's/0.13.0/%{sbt_bootstrap_version}/g' project/build.properties ###################################################################### @@ -438,7 +432,7 @@ sed -i -e 's/0.13.0/%{sbt_bootstrap_version}/g' project/build.properties # fake on F19 %if 0%{?fedora} >= 21 ./climbing-nemesis.py jline jline %{ivy_local_dir} --version 2.11 -./climbing-nemesis.py org.fusesource.jansi jansi %{ivy_local_dir} --version 1.9 +./climbing-nemesis.py org.fusesource.jansi jansi %{ivy_local_dir} --version 1.11 ./climbing-nemesis.py org.fusesource.jansi jansi-native %{ivy_local_dir} --version 1.5 ./climbing-nemesis.py org.fusesource.hawtjni hawtjni-runtime %{ivy_local_dir} --version 1.8 %else @@ -578,7 +572,7 @@ done %endif # remove any references to Scala 2.10.2 -sed -i -e 's/["]2[.]10[.]2["]/\"2.10.3\"/g' $(find . -name \*.xml) +sed -i -e 's/["]2[.]10[.][23]["]/\"2.10.4\"/g' $(find . -name \*.xml) # better not to try and compile the docs project rm -f project/Docs.scala @@ -604,6 +598,13 @@ for jar in %{_javadir}/scala/*.jar ; do cp --symbolic-link $jar scala/lib done +sed -i -e 's/["]2[.]10[.][23]["]/\"2.10.4\"/g' $(find . -name \*.sbt) $(find . -name \*.xml) $(find . -name \*.scala) +sed -i -e 's/["]2[.]10[.]2-RC2["]/\"2.10.4\"/g' $(find . -name \*.sbt) + +# work around proguard bugs with the Scala library +sed -i -e 's/"-dontnote",/"-dontnote", "-dontshrink", "-dontoptimize",/g' project/Proguard.scala +sed -i -e 's/mapLibraryJars.all filterNot in[.]toSet./mapLibraryJars(all.map {f => new java.io.File(f.getCanonicalPath())} filterNot in.map {f => new java.io.File(f.getCanonicalPath())}.toSet)/g' project/Proguard.scala + %build %if %{do_bootstrap} @@ -720,6 +721,11 @@ done %doc README.md LICENSE NOTICE %changelog +* Fri Jul 10 2015 William Benton - 0.13.1-7 +- bootstrap build +- fixes for Proguard +- don't ExcludeArch ARM + * Fri Jun 19 2015 Fedora Release Engineering - 0.13.1-6.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e9b7d86..00c986d 100644 --- a/sources +++ b/sources @@ -1,7 +1,105 @@ df1b2ba31a94c9edcdefeae1bd2e6f30 0.6.2.tar.gz 42754f9b2be5b0dc2c95136d151502d2 1.11.0.tar.gz -505bdd2c16cf65267a42d77c1935aeba SPECS2-1.12.3.tar.gz +cea7035e8d2256429e9a46bb0fdde70e actions-0.13.1-ivy.xml +ea56911f3e618b8d5e1f24ab73e69e43 actions.jar +1dfa58e033130f1c867a719fb16f6442 api-0.13.1-ivy.xml +9e1b6d07409742a767a710abcba28825 api.jar +2e20f9b0f3db4c79ff9108dd312b0a19 apply-macro-0.13.1-ivy.xml +5126b3c3b4c6c046567a2595f841d952 apply-macro.jar +f6b3e40675df2b8746c66f74cd267423 cache-0.13.1-ivy.xml +240b12494580338a00b95ddafa114a3d cache.jar +f6de12e3ece461f84966a1674aca8ea4 classfile-0.13.1-ivy.xml +11a227badab1a5329f0b13d0533050f0 classfile.jar +5e8f3639a2b90cd4b9d732c2f828ea95 classpath-0.13.1-ivy.xml +8e1663554162d21244e76742b61646f2 classpath.jar +1b1490dd5a2bc4a8109812309e2a3fdc climbing-nemesis.py +044e1925cdc8b9b15eee9c6a8ee1417d collections-0.13.1-ivy.xml +c0273ae782b37b3c6b8cb6814cda0796 collections.jar +86a8b701e427a689ae665debf2400a7c command-0.13.1-ivy.xml +959ee861c3a552395eec718d2667f2c7 command.jar +ab55ea92f92e83ceb5275954d270a837 compile-0.13.1-ivy.xml +b9f6b258335c817c541f3b5b2ce3a9f8 compile.jar +f1200f0ca10f7d106bd607e8ba8b2c69 compiler-integration-0.13.1-ivy.xml +57e5413fcbb0cc79f55712cd06c60447 compiler-integration.jar +904945440fde9b55e04cbbdfb17288e2 compiler-interface-bin-0.13.1-ivy.xml +87cfc567b1cf6d2447a94efc845e9e24 compiler-interface-bin-2_8_2.jar +c5181c6e9cfcc338722948448a9dc4c2 compiler-interface-bin-2_9_2.jar +e0658aa9b8d948431243618ef9995deb compiler-interface-bin-2_9_3.jar +c2f281d2338a72ffb6cd8ea486c8aacc compiler-interface-bin.jar +904945440fde9b55e04cbbdfb17288e2 compiler-interface-src-0.13.1-ivy.xml +fbd045b0840b8db032f04e7021aa5bd7 compiler-interface-src.jar +4727902f0e3a69c836b6e4accefcc928 compiler-ivy-integration-0.13.1-ivy.xml +67597c79d37aaaac880c292c31941a76 compiler-ivy-integration.jar +3639601eb054066618eff6956106f2fc completion-0.13.1-ivy.xml +1db531b7e3fbd43b45f9e61f52697c3d completion.jar +3e3762c72ddb7d5eeaea5e01cbb64a11 control-0.13.1-ivy.xml +b40827f075c320026d7b8b182b3fc24e control.jar +350f737b84e3173c4edc547b56ffa16b cross-0.13.1-ivy.xml +5f1c0bb951ed82d1afb8db7224e70d91 cross.jar +d9baf99c331ec9941a20a0cfab7c1378 datatype-generator-0.13.1-ivy.xml +c6cb412a60006ba8f975fea499850413 datatype-generator.jar +04193ee9d9498a5c0e77c37b6a35d43b dispatch-http_2.10-0.8.9.jar +83de37bada051972f1ee00ca0514a22f incremental-compiler-0.13.1-ivy.xml +7caffedcf6bd98d845cf4b624814bf3c incremental-compiler.jar +7b45efeb7a18894867c8ef83ac27e08b interface-0.13.1-ivy.xml +69355918a5dec05c3fa01303788aeaea interface.jar +fa2c8e1b0606c1279e76bbe50888f7de io-0.13.1-ivy.xml +0d0f24727e8689f3647c56a341b447f3 io.jar +0196b2e0fba8618b15167eff51bcc8c7 ivy-0.13.1-ivy.xml +4a76f47773a9435446cc2bf16cbb6b36 ivy-2.3.0.pom b62bab8c8872d5f8fbf74c8d0760452a ivy-2.3.0-rc1.jar +e1765bb5cd8ea7bd8fc46d54c63e650d ivy-2.3.0-rc1.pom +399f9b885005cdc0b4f26721a99000ff ivy.jar +c42636096b462cbc1051f9deb98a5881 launcher-0.13.1-ivy.xml +c4a4a6c51834676d767f44978b7ba971 launcher-interface-0.13.1-ivy.xml +fd862bc63fa29f9bb3ff128b5dd50b36 launcher-interface.jar +b58332fbbfd1a3b0099edc60f6f6ea22 launcher.jar +607b122cd6aad2bc1004e27b9ceb531b logging-0.13.1-ivy.xml +f361a40db10e54e21494ff3d4e63bab8 logging.jar +88f62a47c3e0b9d5b1c21500a9976e06 main-0.13.1-ivy.xml +f86e071ba801623df9f73a10b36cf453 main.jar +929b3f588201c02efd643e375d5a3ca7 main-settings-0.13.1-ivy.xml +a55a5a4c27cedbdfdc0531449dfed640 main-settings.jar +170a12007953e87ca8e59d70136a9215 persist-0.13.1-ivy.xml +a243ebfdc5b8d394d32f3259ae2674d9 persist.jar +13d1718d8328c5003efb93a95e35f4af precompiled-2_8_2-0.13.1-ivy.xml +d33bc56ebbd6617126697714b7c151c0 precompiled-2_9_2-0.13.1-ivy.xml +09d66a0e4e1c9884dec8eb44ae02a16b precompiled-2_9_3-0.13.1-ivy.xml +977495499a95df6776fc114f4859fe06 process-0.13.1-ivy.xml +2dd317b2728b4cae4212a99944fbfc80 process.jar +d73642b133f0eed2c1153bfdd7e3fcc1 relation-0.13.1-ivy.xml +5e9b62de3cba9df2134b076118748541 relation.jar +9ec70ebf72cd8ad55c11f7d0c4f73dca rpmbuild-sbt.boot.properties +c8a2bfe7eddc46d95b99b911ab79bd93 run-0.13.1-ivy.xml +7fa6a22d5238dc6e9d1de8bfeb861c6d run.jar +18053ac413f783e934fabcdd5184649c sbt +5536bcd367a85172d742122069498a22 sbt-0.13.1-ivy.xml +ac26f770adf5727b318a3fda759c0152 sbt.boot.properties +1eb9bccc46a2dc7148fda885cddcc724 sbt-ghpages.jar +1b5a133c77d94c4ca8776e5eef025ee8 sbt-git.jar +f9854a4b343ee77dd43226c6be90ab4c sbt.jar +474a0922e6fa0a80ff478d0892c076e7 sbt-launch-0.13.1-ivy.xml +79e367c11fc2294f865c6ecc47b8886c sbt-launch.jar +71af201e379bf05f276f349a163141f7 sbt-site.jar +930863be3ebce573502eb88826e8cfd6 scalacheck_2.10-1.11.0.jar +f2873ed678037d744551416babc7495a scripted-framework-0.13.1-ivy.xml +cbc208fb078be1e2a09dce08c520228c scripted-framework.jar +b107627f6b785694cbd06b422ad17825 scripted-plugin-0.13.1-ivy.xml +5b26d35056fbe8421946b940f243094e scripted-plugin.jar +f829b34910035b64c2d4fbd9699619bf scripted-sbt-0.13.1-ivy.xml +3b09ab7f1513c6ae6cf66876f9169eba scripted-sbt.jar +505bdd2c16cf65267a42d77c1935aeba SPECS2-1.12.3.tar.gz +b73f95ba41bf4df03e77122ae0e3b7cb sxr_2.10.jar +de345b25321b7802c7edfc135e3f0bf5 tasks-0.13.1-ivy.xml +58c2d02bb972588a4a009df4169d7c25 tasks.jar +6d5a849d150bec79809c125f65e17343 task-system-0.13.1-ivy.xml +1f9675aaed39c7ec7f153fbde1730d2e task-system.jar +a2191c2e5198f6fae2b62236eff81c46 test-agent-0.13.1-ivy.xml +f90219d3b4a9c5376768c7bc5a09942d test-agent.jar +03f98e28df54a6bbc30a67806f2d8dae testing-0.13.1-ivy.xml +eda5287dff78fe5d0e1c4d3422244d69 testing.jar +d20852339ce946c93d2760269111bea2 tracking-0.13.1-ivy.xml +43002b6966c3404533d17811f8b58000 tracking.jar 795e05e326e952e8e9a1f166d3b4a6ff v0.13.1.tar.gz 64349ecd70ed5dd083349e50dd5a60b6 v0.3.0.tar.gz 1e2c25a231f864924ddbf8ab4a3e5527 v0.5.1.tar.gz