no, backout too aggressive fixes and fix it differently

openpkg-tool/openpkg-tool.spec

@@ -40,13 +40,14 @@ Source0:      openpkg.sh
 Source1:      openpkg-index.pl
 Source2:      openpkg-build.pl
 Source3:      openpkg.pod
-Source4:      Makefile
+Source4:      openpkg.1
+Source5:      Makefile
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make, perl
-PreReq:       OpenPKG, openpkg >= 20020206, perl
+BuildPreReq:  OpenPKG, openpkg >= 20020206
+PreReq:       OpenPKG, openpkg >= 20020206
 AutoReq:      no
 AutoReqProv:  no
 
@@ -54,19 +55,8 @@ AutoReqProv:  no
     The OpenPKG tool is a helper utility for managing an OpenPKG instance.
 
 %prep
-    %setup -c -T
-    cp -f %{SOURCE0} .
-    cp -f %{SOURCE1} .
-    cp -f %{SOURCE2} .
-    cp -f %{SOURCE3} .
-    cp -f %{SOURCE4} .
 
 %build
-    %{l_shtool} subst \
-        -e 's;@l_prefix@;%{l_prefix};g' \
-        -e 's;@version@;%{version};g' \
-        openpkg.pod
-    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -77,16 +67,17 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@version@;%{version};g' \
-        openpkg.sh $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
+        %{SOURCE openpkg.sh} $RPM_BUILD_ROOT%{l_prefix}/bin/openpkg
     %{l_shtool} install -c -m 644 \
-        openpkg.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+        -e 's;XX-VERSION-XX;%{version};g' \
+        %{SOURCE openpkg.1} $RPM_BUILD_ROOT%{l_prefix}/man/man1/
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
-        openpkg-index.pl \
+        %{SOURCE openpkg-index.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
-        openpkg-build.pl \
+        %{SOURCE openpkg-build.pl} \
         $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \

openpkg-tool/openpkg.1

@@ -129,12 +129,12 @@
 .\" ========================================================================
 .\"
 .IX Title "OPENPKG 1"
-.TH OPENPKG 1 "2002-11-26" "openpkg-tool" "OpenPKG Maintainance"
+.TH OPENPKG 1 "2002-11-27" "openpkg-tool" "OpenPKG Maintainance"
 .SH "NAME"
 \&\fBopenpkg\fR \- \fBOpenPKG\fR maintainance utility
 .SH "VERSION"
 .IX Header "VERSION"
-openpkg-tool \f(CW@version\fR@
+openpkg-tool XX-VERSION-XX
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 \&\fBopenpkg\fR 
@@ -174,7 +174,7 @@ automated recursive from-scratch installation and updating of existing
 .IX Header "COMMANDS"
 .Sh "\s-1OPENPKG\s0 \s-1INDEX\s0"
 .IX Subsection "OPENPKG INDEX"
-\&\fBopenpkg-index\fR creates an \s-1XML/RDF\s0 based resource index for \s-1RPM\s0
+\&\fBopenpkg index\fR creates an \s-1XML/RDF\s0 based resource index for \s-1RPM\s0
 \&\fI.spec\fR files in a source tree or from an \s-1RPM\s0 package repository. The
 index holds enough information to support an automated build process by
 \&\fBopenpkg build\fR.
@@ -189,7 +189,7 @@ The name of the resource stored in the index. The default is
 \&\fBopenpkg index\fR adds a platform attribute for binary RPMs. The
 attribute is built as \fI%{arch}\fR\f(CW\*(C`\-\*(C'\fR\fIplatform\fR\f(CW\*(C`\-\*(C'\fR\fI%{os}\fR where
 \&\fI%{arch}\fR and \fI%{os}\fR are taken from the \s-1RPM\s0 header and \fIplatform\fR is
-the value of the \fB\-p\fR option. The default value is "\f(CW\*(C`unkown\*(C'\fR". This
+the value of the \fB\-p\fR option. The default value is "\f(CW\*(C`unknown\*(C'\fR". This
 must be used to distinguish between platforms that support the same
 Architecture and \s-1OS\s0 name like various Linux distributions.
 .IP "\fB\-C\fR \fIcache.db\fR" 4
@@ -255,7 +255,7 @@ including their dependencies even when the most recent version
 is already installed.
 .IP "\fB\-Z\fR" 4
 .IX Item "-Z"
-\&\fBopenpkg build\fR ignores a installed packages, the
+\&\fBopenpkg build\fR ignores all installed packages, the
 script will rebuild all selected packages from scratch. 
 Note that this doesn't work together with the \fB\-a\fR option.
 .IP "\fB\-i\fR" 4

openpkg-tool/openpkg.pod

@@ -32,7 +32,7 @@ B<openpkg> - B<OpenPKG> maintainance utility
 
 =head1 VERSION
 
-openpkg-tool @version@
+openpkg-tool XX-VERSION-XX
 
 =head1 SYNOPSIS