adapt groups

[platform/upstream/gcc48.git] / packaging / change_spec

diff --git a/packaging/change_spec b/packaging/change_spec
index ee12148..0e080ba 100644 (file)
--- a/packaging/change_spec
+++ b/packaging/change_spec
@@ -2,8 +2,7 @@
 
 do_icecream=1
 do_cross_static=0
-do_cross_shared=0
-do_optional_compiler=0
+do_cross_shared=1
 do_optional_compiler_languages=0
 rm -f libgcj*.spec libgcj*.changes libffi*.spec libffi*.changes gcc*-testresults.spec gcc*-testresults.changes gcc*.spec cross*.spec cross*.changes
 
@@ -28,11 +27,7 @@ else
        esac
 fi
 
-       echo -n > $outfile
-       if test "$do_optional_compiler" = "1"; then
-           echo '%define run_tests 1' >> $outfile
-           echo '%define build_optional_compiler 1' >> $outfile
-       fi
+       : > $outfile
        if test "$do_optional_compiler_languages" = "1"; then
            echo '%define run_tests 1' >> $outfile
            echo '%define build_optional_compiler_languages 1' >> $outfile
@@ -54,7 +49,6 @@ s/@variant@/-64bit/g
 p
 }
 }' >> $outfile
-       if test "$do_optional_compiler" = "0"; then
        if test "$do_optional_compiler_languages" = "0"; then
        echo '%define building_libjava 1' > libgcj$base_ver.spec
        sed -e '/^# LIBJAVA-DELETE-BEGIN/,/^# LIBJAVA-DELETE-END/d;s/-n libgcj@base_ver@$//g;s/^Name:[[:space:]]*gcc/Name: libgcj/g' \
@@ -100,21 +94,18 @@ s/@variant@/-64bit/g
 p
 }
 }' \
-       | sed -e '/^%package -n libffi'$base_ver'$/d' \
-       | sed -e 's/-n libffi'$base_ver'$//g' \
 >> libffi$base_ver.spec
 
   test -f gcc$base_ver.changes \
     && ( ln -f gcc$base_ver.changes libgcj$base_ver.changes; \
         ln -f gcc$base_ver.changes libffi$base_ver.changes; \
         ln -f gcc$base_ver.changes gcc$base_ver-testresults.changes; )
-       fi
     fi
 
 # disabled: mips, sparc, alpha
 if test "$do_icecream" = 1 ; then
-  for arch in i386 x86_64 armv7hl armv5el armv7el; do
-    exclarch=`echo $arch | sed -e 's/i.86/%ix86/'`
+  for arch in i386 x86_64 armv7hl armv7l; do
+    exclarch=`echo $arch | sed -e 's/ppc$/ppc64/'`
     { sed -n -e '1,/COMMON-BEGIN/p' cross-icecream.spec.in
       sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' $outfile
       sed -n -e '/COMMON-END/,$p' cross-icecream.spec.in; } |
@@ -147,5 +138,8 @@ if test "$do_cross_static" = 1 ; then
 #  test -f gcc$base_ver.changes && ln -f gcc$base_ver.changes cross-avr-gcc$base_ver.changes
 fi
 
+for f in *.spec; do
+  sed -i -e '/^# .*-\(BEGIN\|END\)$/d' $f
+done
 
 exit 0