requires Perl (fixed especially building under Solaris); cleanup packaging a little bit

ispell/ispell.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        Text
 License:      BSD
 Version:      %{V_ispell}
-Release:      20030723
+Release:      20030728
 
 #   list of sources
 Source0:      http://fmg-www.cs.ucla.edu/geoff/tars/ispell-%{V_ispell}.tar.gz
@@ -49,7 +49,7 @@ Patch0:       ispell.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, bison
+BuildPreReq:  OpenPKG, openpkg >= 20020206, make, bison, perl
 PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
@@ -64,7 +64,11 @@ AutoReqProv:  no
 %prep
     %setup -q
     %patch -p0
+
+    #   unpack Unix dictionary
     %{l_gzip} -d -c %{SOURCE words.gz} >$RPM_BUILD_DIR/words
+
+    #   unpack German dictionaries
     mkdir hk-deutsch
     ( cd hk-deutsch
       %{l_gzip} -d -c %{SOURCE hk-deutsch.tar.gz} | %{l_tar} xf -
@@ -72,6 +76,7 @@ AutoReqProv:  no
     %{l_bzip2} -d -c %{SOURCE igerman98-%{V_igerman98}.tar.bz2} | %{l_tar} xf -
 
 %build
+    #   configure package
     #   kludge: determine whether vendor termcap, termlib or curses library exists
     #   reason: some brean-dead platforms (like SuSE, etc) have no termcap library installed.
     termlib=""
@@ -98,7 +103,11 @@ AutoReqProv:  no
       esac
       #   echo "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
     ) >local.h
+
+    #   build package
     %{l_make} %{l_mflags}
+
+    #   build additional German dictionaries
     ( cd hk-deutsch
       cat worte.txt verben.txt \
           adjektive.txt klein.txt geographie.txt vornamen.txt \
@@ -109,13 +118,19 @@ AutoReqProv:  no
       ../buildhash all.words deutsch.aff deutsch.hash
     ) || exit $?
     ( cd igerman98-%{V_igerman98}
-      %{l_shtool} subst -e 's;munchlist;../munchlist;g' Makefile
+      %{l_shtool} subst \
+          -e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
+          bin/*.pl
+      %{l_shtool} subst \
+          -e 's;munchlist;../munchlist;g' \
+          Makefile
       %{l_make} %{l_mflags} \
           UNSQ=cat BUILDHASH=`pwd`/../buildhash \
           german.hash 2>/dev/null
     ) || exit $?
 
 %install
+    #   install package
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/bin \
@@ -133,8 +148,14 @@ AutoReqProv:  no
       echo "#define WORDS      \"$RPM_BUILD_DIR/words\""
       #   echo "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=$RPM_BUILD_DIR/words}\""
     ) >local.h
-    %{l_make} %{l_mflags} config.sh install-basic install-deformatters install-dictbuild install-languages
+    %{l_make} %{l_mflags} \
+        config.sh install-basic install-deformatters install-dictbuild install-languages
+
+    #   strip down installation
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/share/ispell/american*
+
+    #   install German dictionaries
     ( cd hk-deutsch
       %{l_shtool} install -c -m 644 \
           deutsch.aff $RPM_BUILD_ROOT%{l_prefix}/share/ispell/deutsch-old.aff
@@ -147,7 +168,8 @@ AutoReqProv:  no
       %{l_shtool} install -c -m 644 \
           german.hash $RPM_BUILD_ROOT%{l_prefix}/share/ispell/deutsch.hash
     ) || exit $?
-    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files