finally remove <prefix>/bin/{rpm,rpm2cpio} wrappers in preparation to OpenPKG 2.1

openpkg/HISTORY

@@ -2,6 +2,7 @@
 2004
 ====
 
+20040506 finally remove <prefix>/bin/{rpm,rpm2cpio} wrappers in preparation to OpenPKG 2.1
 20040505 rc: skip .snap (FreeBSD 5) and .snapshot (NetApp) directories in *.rpmxxx checking
 20040501 use better GCC detection in "rpmtool cflags" (taken over from "gcc" package)
 20040429 make sure <prefix>/etc/rc does not complain in cronjobs of non-privileged setups

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 #   o any cc(1)
 
 #   the package version/release
-%define       V_openpkg  20040505
+%define       V_openpkg  20040506
 
 #   the used software versions
 %define       V_rpm      4.2.1
@@ -888,36 +888,6 @@ Provides:     openpkg = 2.0.2-2.0.2
     mv $RPM_BUILD_ROOT%{l_prefix}/man/man8/rpm.8 \
        $RPM_BUILD_ROOT%{l_prefix}/libexec/openpkg/rpm.8
 
-    #   install backward compatibility wrappers
-    for cmd in rpm rpm2cpio; do
-        ( echo "#!/bin/sh"
-          echo 'warn=yes'
-          echo 'if [ ".$HOME" != . ]; then'
-          echo '    if [ ! -d $HOME/.openpkg ]; then'
-          echo '        (umask 022; mkdir $HOME/.openpkg >/dev/null 2>&1 || true)'
-          echo '    fi'
-          echo '    if [ -d $HOME/.openpkg ]; then'
-          echo "        if [ -f \$HOME/.openpkg/warning ] && \\"
-          echo '           [ ".`find $HOME/.openpkg -name warning -mtime -1 -print`" != . ]; then'
-          echo '            warn=no'
-          echo '        else'
-          echo '            date >$HOME/.openpkg/warning 2>/dev/null || true'
-          echo '        fi'
-          echo '    fi'
-          echo 'fi'
-          echo 'if [ ".$warn" = .yes ]; then'
-          echo "    ( echo \"The \\\"%{l_prefix}/bin/$cmd\\\" command is deprecated since OpenPKG 2.0\""
-          echo "      echo \"because of namespace and integration reasons. The command will be finally\""
-          echo "      echo \"removed in OpenPKG 2.1, so please start using the new canonical command\""
-          echo "      echo \"\\\"%{l_prefix}/bin/openpkg $cmd\\\" instead. Thanks.\""
-          echo "    ) | %{l_prefix}/lib/openpkg/rpmtool msg -b -t warn"
-          echo '    sleep 8'
-          echo 'fi'
-          echo "exec %{l_prefix}/bin/openpkg $cmd \${1+\"\$@\"}"
-        ) >$RPM_BUILD_ROOT%{l_prefix}/bin/$cmd
-        chmod 755 $RPM_BUILD_ROOT%{l_prefix}/bin/$cmd
-    done
-
     #   install RPM extension
     ( cd rpm-%{V_rpm}
       cp file/file $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/file
@@ -1091,8 +1061,6 @@ Provides:     openpkg = 2.0.2-2.0.2
     %dir %{l_prefix}/cgi
     %dir %{l_prefix}/bin
     %{l_prefix}/bin/openpkg
-    %{l_prefix}/bin/rpm
-    %{l_prefix}/bin/rpm2cpio
     %dir %{l_prefix}/etc
     %{l_prefix}/etc/rc
     %config(noreplace) %{l_prefix}/etc/rc.conf