PR#1: FTBFS fix - rpms/sbt - src.fedoraproject.org

rpms / sbt

#1 FTBFS fix

Merged 5 years ago by tdawson. Opened 5 years ago by merlinm.

Unknown source master into master

Fix FTBFS (BZ#1424418)

Merlin Mathesius • 5 years ago

21c018d

Remove source files from lookaside cache that have been committed directly

Merlin Mathesius • 5 years ago

b2b3968

.gitignore

file modified

-6

		`@@ -61,7 +61,6 @@`
		`/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`
		`@@ -77,8 +76,6 @@`
		`/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`
		`@@ -90,11 +87,8 @@`
		`/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`

sbt

file modified

+8 -1

		`@@ -1,6 +1,13 @@`
		`#!/bin/sh`

		`- if \[ $(rpm -q --queryformat '%{version}' fedora-release) -ge 21 \] ; then`
		`+ relpkg=$(rpm -q --whatprovides redhat-release \| head -1)`
		`+ relver=$(rpm -q --queryformat '%{version}' $relpkg)`
		`+ case "$relpkg" in`
		`+ fedora* ) fedora=${relver%%[^0-9]*} rhel= ;;`
		`+ * ) rhel=${relver%%[^0-9]*} fedora= ;;`
		`+ esac`
		`+`
		`+ if \[ 0$fedora -ge 21 -o 0$rhel -gt 7 \] ; then`
		`export JLINE=jline`
		`else`
		`export JLINE=jline2`

sbt.spec

file modified

+15 -11

		`@@ -6,8 +6,8 @@`

		`# build non-bootstrap packages with tests, cross-referenced sources, etc`
		`%global do_proper 0`
		`- %global pkg_rel 8`
		`- %global scala_version 2.10.4`
		`+ %global pkg_rel 9`
		`+ %global scala_version 2.10.6`
		`%global scala_short_version 2.10`
		`%global sbt_bootstrap_version 0.13.1`
		`%global sbt_major 0`
		`@@ -49,7 +49,7 @@`

		`Name: sbt`
		`Version: %{sbt_version}`
		`- Release: %{pkg_rel}%{?dist}.3`
		`+ Release: %{pkg_rel}%{?dist}`
		`Summary: The simple build tool for Scala and Java projects`

		`BuildArch: noarch`
		`@@ -433,11 +433,11 @@`
		`./climbing-nemesis.py org.scala-lang scala-reflect %{ivy_local_dir} --version %{scala_version}`

		`# fake on F19`
		`- %if 0%{?fedora} >= 21`
		`+ %if 0%{?fedora} >= 21 \|\| 0%{?rhel} > 7`
		`./climbing-nemesis.py jline jline %{ivy_local_dir} --version 2.11`
		`./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`
		`+ ./climbing-nemesis.py org.fusesource.jansi jansi-native %{ivy_local_dir} --version 1.7`
		`+ ./climbing-nemesis.py org.fusesource.hawtjni hawtjni-runtime %{ivy_local_dir} --version 1.15`
		`%else`
		`./climbing-nemesis.py jline jline %{ivy_local_dir} --version 2.11 --jarfile %{_javadir}/jline2-2.10.jar`
		`./climbing-nemesis.py org.fusesource.jansi jansi %{ivy_local_dir} --version 1.9`
		`@@ -574,9 +574,6 @@`

		`%endif`

		`- # remove any references to Scala 2.10.2`
		`- 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`

		`@@ -601,8 +598,8 @@`
		`cp --symbolic-link $jar scala/lib`
		`done`

		`- sed -i -e 's/["]2[.]10[.][23]["]/\"2.10.4\"/g' $(find . -name \.sbt -type f) $(find . -name \.xml) $(find . -name \*.scala)`
		`- sed -i -e 's/["]2[.]10[.]2-RC2["]/\"2.10.4\"/g' $(find . -name \*.sbt -type f)`
		`+ sed -i -e 's/["]2[.]10[.][234]["]/\"%{scala_version}\"/g' $(find . -name \.sbt -type f) $(find . -name \.xml) $(find . -name \*.scala)`
		`+ sed -i -e 's/["]2[.]10[.]2-RC2["]/\"%{scala_version}\"/g' $(find . -name \*.sbt -type f)`

		`# work around proguard bugs with the Scala library`
		`sed -i -e 's/"-dontnote",/"-dontnote", "-dontshrink", "-dontoptimize",/g' project/Proguard.scala`
		`@@ -724,6 +721,13 @@`
		`%doc README.md LICENSE NOTICE`

		`%changelog`
		`+ * Tue Jan 16 2018 Merlin Mathesius <mmathesi@redhat.com> 0.13.1-9`
		`+ - Manually rebase/apply earlier patch provided with BZ#1424418 to fix FTBFS:`
		`+ - Thu Jun 22 2017 Troy Dawson <tdawson@redhat.com>`
		`+ - Fix spec file to build with scala 2.10.6 (#1424418)`
		`+ - Additional spec file FTBFS fixes to build with jansi-native 1.5 and hawtjni 1.8`
		`+ - Cleanup spec file conditionals`
		`+`
		`* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-8.3`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild`

sources

file modified

-6

		`@@ -12,7 +12,6 @@`
		`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`
		`@@ -46,9 +45,7 @@`
		`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`
		`@@ -69,12 +66,9 @@`
		`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`

merlinm commented 5 years ago

Fix FTBFS BZ#1424418

Remove source files from lookaside cache that have been committed directly to dist-git repository.
Manually rebase/apply earlier patch provided with BZ#1424418:

Thu Jun 22 2017 Troy Dawson <tdawson@redhat.com>
Fix spec file to build with scala 2.10.6 (#1424418)

Additional spec file fixes to build with jansi-native 1.5 and hawtjni 1.8
Fix conditional in sbt script
Cleanup spec file conditionals

Successful Rawhide scratch build of this update: https://koji.fedoraproject.org/koji/taskinfo?taskID=24233035

Metadata

Assignee

None

Tags

No Tags

Flags

Changes Summary 4

rpms / sbt

Source Code

#1 FTBFS fix Merged 5 years ago by tdawson. Opened 5 years ago by merlinm. Unknown source master into master

Metadata

Flags

Changes Summary 4

#1 FTBFS fix

Merged 5 years ago by tdawson. Opened 5 years ago by merlinm.

Unknown source master into master