- updated from SPECS r1.28

Changed files:
    adapter -> 1.4
    adapter_.sh -> 1.4

diff --git a/adapter b/adapter
index 1e767919ed9f777b88d488dcefad7a8bcfb0c898..1b5f3611e8f4e371ee66652ab540cfb9bec733af 100644 (file)
--- a/adapter
+++ b/adapter
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# This is adapter v0.29. Adapter adapts .spec files for PLD Linux.
+# This is adapter v0.30-RELEASE. Adapter adapts .spec files for PLD Linux.
 #
-# Copyright (C) 1999-2003 PLD-Team <feedback@pld-linux.org>
+# Copyright (C) 1999-2008 PLD Team <feedback@pld-linux.org>
 # Authors:
 #      Michał Kuratczyk <kura@pld.org.pl>
 #      Sebastian Zagrodzki <s.zagrodzki@mimuw.edu.pl>
@@ -83,7 +83,7 @@ diffcol()
         s,^@@ ,\e[33m&,g;
         s,^-,\e[35m&,;
         s,^+,\e[36m&,;
-        s,\r,\e[44m^M\e[49m,g;
+        s,\r,\e[44m^M\e[49m,g;
         s,     ,    ,g;
         s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\e[41m\2\e[49m,g;
         s,$,\e[0m,
@@ -189,10 +189,12 @@ adapterize()
        rm -rf $tmpdir
 }
 
-if [ $# -ne 1 -o ! -f "$1" ]; then
+SPECFILE="$1"
+[ -f "$SPECFILE" ] || SPECFILE="$(basename $SPECFILE .spec).spec"
+
+if [ $# -ne 1 -o ! -f "$SPECFILE" ]; then
        echo "$usage"
        exit 1
 fi
 
-SPECFILE="$1"
 adapterize

diff --git a/adapter_.sh b/adapter_.sh
index 1e767919ed9f777b88d488dcefad7a8bcfb0c898..1b5f3611e8f4e371ee66652ab540cfb9bec733af 100644 (file)
--- a/adapter_.sh
+++ b/adapter_.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# This is adapter v0.29. Adapter adapts .spec files for PLD Linux.
+# This is adapter v0.30-RELEASE. Adapter adapts .spec files for PLD Linux.
 #
-# Copyright (C) 1999-2003 PLD-Team <feedback@pld-linux.org>
+# Copyright (C) 1999-2008 PLD Team <feedback@pld-linux.org>
 # Authors:
 #      Michał Kuratczyk <kura@pld.org.pl>
 #      Sebastian Zagrodzki <s.zagrodzki@mimuw.edu.pl>
@@ -83,7 +83,7 @@ diffcol()
         s,^@@ ,\e[33m&,g;
         s,^-,\e[35m&,;
         s,^+,\e[36m&,;
-        s,\r,\e[44m^M\e[49m,g;
+        s,\r,\e[44m^M\e[49m,g;
         s,     ,    ,g;
         s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\e[41m\2\e[49m,g;
         s,$,\e[0m,
@@ -189,10 +189,12 @@ adapterize()
        rm -rf $tmpdir
 }
 
-if [ $# -ne 1 -o ! -f "$1" ]; then
+SPECFILE="$1"
+[ -f "$SPECFILE" ] || SPECFILE="$(basename $SPECFILE .spec).spec"
+
+if [ $# -ne 1 -o ! -f "$SPECFILE" ]; then
        echo "$usage"
        exit 1
 fi
 
-SPECFILE="$1"
 adapterize