git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@475 04377dda-e619-0410...

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 791634c8ca6a89ca5f9874877196369d076ddc84..4bd7472d6489ddd54808733e61db77a2666ac39e 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -25,6 +25,7 @@ simplepkg changelog
     - PATCH FILES parameter default set to ""
     - NUMBER OF PREFIX SLASHES TO STRIP parameter default set to "1"
     - change_others_parameters function minor fixe
+    - variable ARCH="noarch" in SlackBuild file, if [[ARCH]]="noarch"
 
 0.6pre11
 ========

diff --git a/trunk/src/mkbuild b/trunk/src/mkbuild
index 53a8362d785a2a005eb8fdc59b45d2def87ce06b..38cc78de9c46317a07b9afd1b611c90eb411f3a5 100755 (executable)
--- a/trunk/src/mkbuild
+++ b/trunk/src/mkbuild
@@ -290,7 +290,11 @@ function start_build  {
     edit_file "DECOMPRESSOR" "$DECOMPRESSOR" $1
     edit_file "DECOMPRESSOR TEST FLAG" "$DECOMPRESSOR_TEST_FLAG" $1
     edit_file "PROGRAM URL" "$URL" $1
-    edit_file "ARCH" "$ARCH" $1
+    if [ "$ARCH" == "noarch" ]; then
+        sed -i 's/^ARCH=.*$/ARCH="noarch"/' $1
+    else
+        edit_file "ARCH" "$ARCH" $1
+    fi
     edit_file "NUMBER OF JOBS" "$NUMJOBS" $1
     edit_file "VERSION" $VERSION $1
     edit_file "SOURCE NAME CONSTRUCTION STRING" "$CONST_STRING" $1