From 2db5aa38cfdc4f271802925e129ebc01258efd57 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 2 Jul 2018 16:00:55 +0200 Subject: [PATCH 1/6] Initial import --- scala.yaml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 scala.yaml diff --git a/scala.yaml b/scala.yaml new file mode 100644 index 0000000..4b1cfb1 --- /dev/null +++ b/scala.yaml @@ -0,0 +1,65 @@ +--- +document: modulemd +version: 2 +data: + summary: A hybrid functional/object-oriented language for the JVM + description: >- + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages. It is also fully interoperable with Java. + license: + module: + - MIT + + dependencies: + - buildrequires: + javapackages-tools: [201801] + requires: + platform: [] + profiles: + default: + rpms: + - scala + api: + rpms: + - scala + - scala-apidoc + - scala-swing + filter: + rpms: + - ant-scala + - hawtjni + - hawtjni-javadoc + - jansi-javadoc + - jansi-native-javadoc + - jline-javadoc + - maven-hawtjni-plugin + components: + rpms: + hawtjni: + buildorder: 10 + ref: javapackages + rationale: > + Runtime dependency of jansi, jansi-native. + jansi: + buildorder: 30 + ref: javapackages + rationale: > + Runtime dependency of jline, scala. + jansi-native: + buildorder: 20 + ref: javapackages + multilib: [] + rationale: > + Runtime dependency of jansi. + jline: + buildorder: 40 + ref: javapackages + rationale: > + Runtime dependency of scala. + scala: + buildorder: 50 + ref: javapackages + rationale: > + Module API. From 90fe16115fb16d190c55e412a7cd36df0f23b6d3 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 2 Jul 2018 17:06:57 +0200 Subject: [PATCH 2/6] Resubmit with scala branch created From baeba42251a1b0b2ab93631c569773e0f0935b98 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Jul 2018 17:18:25 +0200 Subject: [PATCH 3/6] Add koschei.cfg used to generate scala.yaml --- koschei.cfg | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 koschei.cfg diff --git a/koschei.cfg b/koschei.cfg new file mode 100644 index 0000000..d73e463 --- /dev/null +++ b/koschei.cfg @@ -0,0 +1,125 @@ +# -*- python -*- +# vim: ft=python +config = { + "buildrequires": [ + "javapackages-tools", + ], + "requires": [ + "platform", + ], + + "bootstrap": False, + "full_refs": False, + "default_ref": "javapackages", + "include_build_deps": False, + "closure": False, + "filter_unused": True, + "topo_sort": True, + + "api": [ + "scala", + "scala-apidoc", + "scala-swing", + ], + "profiles": { + "default": ["scala"], + }, + "filter": [ + ], + "includes": [ + ], + "excludes": [ + "javapackages-tools", + "java-1.7.0-openjdk", + "java-1.8.0-openjdk", + ], + "frozen_refs": [ + ], + "stream_override": { + "javapackages-tools": { + "2.10": "[201801]", + }, + "platform": { + "2.10": "[]", + }, + }, + + "macros": { + "_with_xmvn_javadoc": 1, + "_without_asciidoc": 1, + "_without_avalon": 1, + "_without_bouncycastle": 1, + "_without_cython": 1, + "_without_dafsa": 1, + "_without_desktop": 1, + "_without_doxygen": 1, + "_without_dtd": 1, + "_without_eclipse": 1, + "_without_ehcache": 1, + "_without_emacs": 1, + "_without_equinox": 1, + "_without_fop": 1, + "_without_ftp": 1, + "_without_gradle": 1, + "_without_groovy": 1, + "_without_hadoop": 1, + "_without_hsqldb": 1, + "_without_itext": 1, + "_without_jackson": 1, + "_without_jmh": 1, + "_without_jna": 1, + "_without_jpa": 1, + "_without_junit5": 1, + "_without_logback": 1, + "_without_markdown": 1, + "_without_memcached": 1, + "_without_memoryfilesystem": 1, + "_without_obr": 1, + "_without_python": 1, + "_without_reporting": 1, + "_without_scm": 1, + "_without_snappy": 1, + "_without_spring": 1, + "_without_ssh": 1, + "_without_testlib": 1, + }, + + "summary": "A hybrid functional/object-oriented language for the JVM", + "description": """\ + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages. It is also fully interoperable with Java. + """, + + "koji_config": { + "server": "https://koji.kjnet.xyz/kojihub", + "topurl": "https://koji.kjnet.xyz/kojifiles", + "multicall_chunk_size": 1000, + "tag_name": "hybrid", + }, + "dependency": { + "repo_arch": "x86_64", + "resolve_for_arch": "x86_64", + "ignore_weak_deps": True, + "cache_l2_capacity": 2, + }, + "directories": { + "cachedir": "/tmp/maven-modulemd-gen", + }, + "logging": { + "version": 1, + "loggers": { + "": { + "level": "INFO", + "handlers": ["stderr"], + }, + }, + "handlers": { + "stderr": { + "class": "logging.StreamHandler", + "stream": "ext://sys.stderr" + }, + }, + }, +} From 90dc1eed8ec4fbf279c20f5f4ec59d01efc2890a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 2 Jul 2018 17:55:03 +0200 Subject: [PATCH 4/6] Regenerate scala.yaml --- scala.yaml | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/scala.yaml b/scala.yaml index 4b1cfb1..b95cb64 100644 --- a/scala.yaml +++ b/scala.yaml @@ -11,7 +11,6 @@ data: license: module: - MIT - dependencies: - buildrequires: javapackages-tools: [201801] @@ -35,6 +34,46 @@ data: - jansi-native-javadoc - jline-javadoc - maven-hawtjni-plugin + buildopts: + rpms: + macros: | + %_with_xmvn_javadoc 1 + %_without_asciidoc 1 + %_without_avalon 1 + %_without_bouncycastle 1 + %_without_cython 1 + %_without_dafsa 1 + %_without_desktop 1 + %_without_doxygen 1 + %_without_dtd 1 + %_without_eclipse 1 + %_without_ehcache 1 + %_without_emacs 1 + %_without_equinox 1 + %_without_fop 1 + %_without_ftp 1 + %_without_gradle 1 + %_without_groovy 1 + %_without_hadoop 1 + %_without_hsqldb 1 + %_without_itext 1 + %_without_jackson 1 + %_without_jmh 1 + %_without_jna 1 + %_without_jpa 1 + %_without_junit5 1 + %_without_logback 1 + %_without_markdown 1 + %_without_memcached 1 + %_without_memoryfilesystem 1 + %_without_obr 1 + %_without_python 1 + %_without_reporting 1 + %_without_scm 1 + %_without_snappy 1 + %_without_spring 1 + %_without_ssh 1 + %_without_testlib 1 components: rpms: hawtjni: @@ -50,7 +89,6 @@ data: jansi-native: buildorder: 20 ref: javapackages - multilib: [] rationale: > Runtime dependency of jansi. jline: From 5a0be0a4ff977b773bbd4b1b6a301ce6d7ed2884 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Aug 2018 14:48:25 +0200 Subject: [PATCH 5/6] Non-bootstrap build --- scala.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/scala.yaml b/scala.yaml index b95cb64..875e146 100644 --- a/scala.yaml +++ b/scala.yaml @@ -14,6 +14,7 @@ data: dependencies: - buildrequires: javapackages-tools: [201801] + scala: ['2.10'] requires: platform: [] profiles: From 322e9a3ac51f6c69e496fb06eedc64b01d011e41 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Nov 2018 00:11:54 +0100 Subject: [PATCH 6/6] Add explicit buildrequires on platform --- scala.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/scala.yaml b/scala.yaml index 875e146..c997c09 100644 --- a/scala.yaml +++ b/scala.yaml @@ -15,6 +15,7 @@ data: - buildrequires: javapackages-tools: [201801] scala: ['2.10'] + platform: [f28] requires: platform: [] profiles: