From ca7a8e298896475574dd1ef3b545483ece453d9a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 9 Oct 2017 18:31:26 +0200 Subject: [PATCH 1/6] update font module requirement with stream name --- java.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java.yaml b/java.yaml index deebca3..f5c3adb 100644 --- a/java.yaml +++ b/java.yaml @@ -11,7 +11,7 @@ data: bootstrap: master requires: platform: master - fonts: master + fonts: f27 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/java From 5bcbfaa62ca7b4496885613d0a3002f6b1176bb7 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 18 Oct 2017 10:53:42 +0200 Subject: [PATCH 2/6] switch to f27 stream requirements --- java.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java.yaml b/java.yaml index f5c3adb..98dae60 100644 --- a/java.yaml +++ b/java.yaml @@ -8,9 +8,9 @@ data: - MIT dependencies: buildrequires: - bootstrap: master + bootstrap: f27 requires: - platform: master + platform: f27 fonts: f27 references: community: https://docs.pagure.org/modularity/ From 087d46a1343b99fef4ee9baa1d1abaac2b552b6f Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 24 Oct 2017 19:45:02 +0200 Subject: [PATCH 3/6] rip out components that are either in bootstrap or in X11-base(runtime deps) --- java.yaml | 67 +++++++++---------------------------------------------- 1 file changed, 10 insertions(+), 57 deletions(-) diff --git a/java.yaml b/java.yaml index deebca3..9f0b203 100644 --- a/java.yaml +++ b/java.yaml @@ -12,6 +12,7 @@ data: requires: platform: master fonts: master + X11-base: master references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/java @@ -32,66 +33,18 @@ data: - javapackages-tools components: rpms: + # copy-jdk-configs-3.3-1.fc28 copy-jdk-configs: rationale: Generated. - ref: f27 - giflib: - rationale: Generated. - ref: f27 + ref: 61d421701032657bcdb988012965865238bda228 +- giflib: +- rationale: Generated. +- ref: fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da + # java-1.8.0-openjdk-1.8.0.144-7.b01.fc28 java-1.8.0-openjdk: rationale: Generated. - ref: f27 + ref: d30d552aeb160b7c29be108d2124832b30505307 + # javapackages-tools-5.0.0-9.fc28 javapackages-tools: rationale: Generated. - ref: f27 - libfontenc: - rationale: Generated. - ref: f27 - libICE: - rationale: Generated. - ref: f27 - libSM: - rationale: Generated. - ref: f27 - libX11: - rationale: Generated. - ref: f27 - libXau: - rationale: Generated. - ref: f27 - libxcb: - rationale: Generated. - ref: f27 - libXcomposite: - rationale: Generated. - ref: f27 - libXext: - rationale: Generated. - ref: f27 - libXfont: - rationale: Generated. - ref: f27 - libXi: - rationale: Generated. - ref: f27 - libXrender: - rationale: Generated. - ref: f27 - libXtst: - rationale: Generated. - ref: f27 - lua-posix: - rationale: Generated. - ref: f27 - ttmkfdir: - rationale: Generated. - ref: f27 - which: - rationale: Generated. - ref: f27 - xorg-x11-fonts: - rationale: Generated. - ref: f27 - xorg-x11-font-utils: - rationale: Generated. - ref: f27 + ref: aad699ef126f4ceb56997a1ef3b2c1142c1be503 From 90cd3377228e81eb9a5af6c511bbdead359ebf59 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 24 Oct 2017 19:47:20 +0200 Subject: [PATCH 4/6] fix cut@paste errors --- java.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java.yaml b/java.yaml index 9f0b203..2c12c77 100644 --- a/java.yaml +++ b/java.yaml @@ -37,9 +37,9 @@ data: copy-jdk-configs: rationale: Generated. ref: 61d421701032657bcdb988012965865238bda228 -- giflib: -- rationale: Generated. -- ref: fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da + giflib: + rationale: Generated. + ref: fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da # java-1.8.0-openjdk-1.8.0.144-7.b01.fc28 java-1.8.0-openjdk: rationale: Generated. From cd69734c3fbfb17fd38dda2ca7c75ff74cbe9b7a Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 25 Oct 2017 10:32:38 +0200 Subject: [PATCH 5/6] drop packages from X1-base, require it instead. Use git hashes --- java.yaml | 64 +++++++++++-------------------------------------------- 1 file changed, 13 insertions(+), 51 deletions(-) diff --git a/java.yaml b/java.yaml index 98dae60..2366f8d 100644 --- a/java.yaml +++ b/java.yaml @@ -12,6 +12,7 @@ data: requires: platform: f27 fonts: f27 + X11-base: f27 references: community: https://docs.pagure.org/modularity/ documentation: https://github.com/modularity-modules/java @@ -32,66 +33,27 @@ data: - javapackages-tools components: rpms: + # copy-jdk-configs-3.2-1.fc27 copy-jdk-configs: rationale: Generated. - ref: f27 + ref: ecc863bce52965d9b22f8bd524e0be2ae6e48dad + # giflib-4.1.6-19.fc27 giflib: rationale: Generated. - ref: f27 + ref: fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da + # java-1.8.0-openjdk-1.8.0.144-7.b01.fc27 java-1.8.0-openjdk: rationale: Generated. - ref: f27 + ref: 283531e22c5ad643432eed85ca9e023aba860210 + # javapackages-tools-5.0.0-7.fc27 javapackages-tools: rationale: Generated. - ref: f27 - libfontenc: - rationale: Generated. - ref: f27 - libICE: - rationale: Generated. - ref: f27 - libSM: - rationale: Generated. - ref: f27 - libX11: - rationale: Generated. - ref: f27 - libXau: - rationale: Generated. - ref: f27 - libxcb: - rationale: Generated. - ref: f27 - libXcomposite: - rationale: Generated. - ref: f27 - libXext: - rationale: Generated. - ref: f27 - libXfont: - rationale: Generated. - ref: f27 - libXi: - rationale: Generated. - ref: f27 - libXrender: - rationale: Generated. - ref: f27 - libXtst: - rationale: Generated. - ref: f27 + ref: 01b45a61475e2a952750dea2fe8f8714d0090dfc + # lua-posix-33.3.1-7.fc27 lua-posix: rationale: Generated. - ref: f27 + ref: 9365d326058c1f370a000d9463bcbc720e6bcec4 + # ttmkfdir-3.0.9-51.fc27 ttmkfdir: rationale: Generated. - ref: f27 - which: - rationale: Generated. - ref: f27 - xorg-x11-fonts: - rationale: Generated. - ref: f27 - xorg-x11-font-utils: - rationale: Generated. - ref: f27 + ref: ef8ed8e754551aefa3c127569fe90123f01cc5eb From 2b00257388f99746cfbe4c9c5536e1682c7780d2 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Fri, 17 Nov 2017 14:30:31 +0100 Subject: [PATCH 6/6] add back lua-posix, update java-1.8.0-openjdk --- java.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java.yaml b/java.yaml index 2c12c77..4c19dc5 100644 --- a/java.yaml +++ b/java.yaml @@ -37,14 +37,18 @@ data: copy-jdk-configs: rationale: Generated. ref: 61d421701032657bcdb988012965865238bda228 + # giflib-4.1.6-19.fc27 giflib: rationale: Generated. ref: fe469abbbc28f29b9ae8cc8c2a0d87ca4f5e41da - # java-1.8.0-openjdk-1.8.0.144-7.b01.fc28 + # java-1.8.0-openjdk-1.8.0.151-1.b12.fc28 java-1.8.0-openjdk: rationale: Generated. - ref: d30d552aeb160b7c29be108d2124832b30505307 + ref: 5d847512a3b55f72b8ce5a39dd71d8a322d272fa # javapackages-tools-5.0.0-9.fc28 javapackages-tools: rationale: Generated. ref: aad699ef126f4ceb56997a1ef3b2c1142c1be503 + lua-posix: + rationale: Generated. + ref: 9365d326058c1f370a000d9463bcbc720e6bcec4