simplify version check

the revision is no longer needed, adapter.sh and adapter.awk can't be
updated separately in git like in cvs

diff --git a/adapter.awk b/adapter.awk
index b9561d49b1b3faeef54f87a3a3c478af64d35151..7e26f90774e1198dfec2cf459c1edece9c6443c1 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -33,8 +33,7 @@ BEGIN {
        RPM_SECTIONS = "package|build|changelog|clean|description|install|post|posttrans|postun|pre|prep|pretrans|preun|triggerin|triggerpostun|triggerun|verifyscript|check"
        SECTIONS = "^%(" RPM_SECTIONS ")"
 
-       rev = "1.514"
-       VERSION = "0.36/" rev
+       VERSION="1.514"
 
        PREAMBLE_TAGS = "(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires|Suggests|Auto(Req|Prov))"
 
@@ -1954,14 +1953,6 @@ function import_rpm_macros(  v) {
                exit(rc = 1)
        }
 
-       # update this version dep each time some new macro export is added
-       v = 1.52
-       if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < v) {
-               printf("adapter shell script is outdated: Need %s, got %s. Please update it.\n", v, ENVIRON["ADAPTER_REVISION"]) > "/dev/stderr"
-               do_not_touch_anything = 1
-               exit(rc = 1)
-       }
-
        prefix = ENVIRON["_prefix"]
        bindir = ENVIRON["_bindir"]
        sbindir = ENVIRON["_sbindir"]

diff --git a/adapter.sh b/adapter.sh
index 2b1e987107713b7bad171a25eaedd53cdbbc3e0c..6c08a11e06336447409ff8e56094effb1a7f5ada 100755 (executable)
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,11 +12,10 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-REVISION=1.52
-VERSION="v0.35/$REVISION"
+VERSION="1.514"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
-$VERSION (C) 1999-2013 Free Penguins".
+v$VERSION (C) 1999-2016 Free Penguins".
 
 PROGRAM=${0##*/}
 dir=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
@@ -247,8 +246,6 @@ import_rpm_macros() {
        export _cvsmailfeedback='%{?_cvsmailfeedback}%{!?_cvsmailfeedback:PLD Team <feedback@pld-linux.org>}'
        "
 
-       export ADAPTER_REVISION=$REVISION
-
        eval $(rpm --eval "$(echo -e $eval_expr)")
 }
 

diff --git a/adapter.spec b/adapter.spec
index 9b7b54f686e448d3bb9f7f5315efb533b7f299ee..174cf03d0c0a0227cafd1d18c58a145fd35636a3 100644 (file)
--- a/adapter.spec
+++ b/adapter.spec
@@ -23,8 +23,14 @@ cp -p %{SOURCE0} %{SOURCE1} .
 
 %{__sed} -i -e 's,^adapter=.*/adapter.awk,adapter=%{_libdir}/adapter.awk,' adapter.sh
 
-%{__sed} -i -e '/^VERSION=/s,\([^/]\+\)/.*",\1-RELEASE",' adapter.sh
-%{__sed} -i -e '/\tRCSID =/,/^\trev =/d;/\tVERSION = /s,\([^/]\+\)/.*,\1-RELEASE",' adapter.awk
+%build
+die() { echo >&2 "$*"; exit 1; }
+for f in adapter.sh adapter.awk; do
+       v=$(sed -rne 's/.*VERSION="([^"]+)".*/\1/p' $f)
+       if [ "$v" != "%{version}" ]; then
+               die "VERSION not %{version} in $f"
+       fi
+done
 
 %install
 rm -rf $RPM_BUILD_ROOT