From 1e8afcb76f5319a7f39c0f93c9a9417c44533387 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Sat, 17 Nov 2012 07:13:49 +0000 Subject: [PATCH] Stop unmerging sys-apps/file for install-cd and admin-cd. Also stop unmerging net-misc/rsync on admin-cd and start unmerging gcc - testing bug 407051. --- releases/weekly/specs/amd64/hardened/admincd-stage2.spec | 4 +--- releases/weekly/specs/amd64/installcd-stage2-minimal.spec | 1 - releases/weekly/specs/x86/hardened/admincd-stage2.spec | 4 +--- releases/weekly/specs/x86/installcd-stage2-minimal.spec | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec index 92dd4792..62b4ac0b 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage2.spec @@ -106,12 +106,10 @@ livecd/unmerge: dev-libs/mpfr dev-python/pycrypto dev-util/pkgconfig - net-misc/rsync perl-core/PodParser perl-core/Test-Harness sys-apps/debianutils sys-apps/diffutils - sys-apps/file sys-apps/groff sys-apps/man sys-apps/man-pages @@ -127,7 +125,7 @@ livecd/unmerge: sys-devel/bison sys-devel/flex # This might be needed for software speech. -# sys-devel/gcc + sys-devel/gcc sys-devel/gcc-config sys-devel/gettext sys-devel/gnuconfig diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec index 13e22b55..3bcaabea 100644 --- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec @@ -109,7 +109,6 @@ livecd/unmerge: perl-core/Test-Harness sys-apps/debianutils sys-apps/diffutils - sys-apps/file sys-apps/groff sys-apps/man sys-apps/man-pages diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec index 9f08a430..f64e1b2a 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec @@ -104,12 +104,10 @@ livecd/unmerge: dev-libs/mpfr dev-python/pycrypto dev-util/pkgconfig - net-misc/rsync perl-core/PodParser perl-core/Test-Harness sys-apps/debianutils sys-apps/diffutils - sys-apps/file sys-apps/groff sys-apps/man sys-apps/man-pages @@ -125,7 +123,7 @@ livecd/unmerge: sys-devel/bison sys-devel/flex # This might be needed for software speech. -# sys-devel/gcc + sys-devel/gcc sys-devel/gcc-config sys-devel/gettext sys-devel/gnuconfig diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec index 71784ed5..ea1574e9 100644 --- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec +++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec @@ -104,7 +104,6 @@ livecd/unmerge: perl-core/Test-Harness sys-apps/debianutils sys-apps/diffutils - sys-apps/file sys-apps/groff sys-apps/man sys-apps/man-pages