backout accidental commits by Peter

openpkg/openpkg.spec

@@ -39,7 +39,7 @@
 
 #   the package version and release
 %define       V_openpkg 0.9
-%define       R_openpkg 33
+%define       R_openpkg 32
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -110,7 +110,6 @@ Source40:     dot.bash_login
 Source41:     dot.lsyncrc
 Source42:     db-%{V_db}.patch
 Source43:     rc.conf
-Source44:     getopt.c
 
 #   build information
 Prefix:       %{l_prefix}
@@ -296,16 +295,6 @@ Provides:     OpenPKG
       ${l_patch} -p0 <`SOURCE rpm-%{V_rpm}.patch.porting`
       ${l_patch} -p0 <`SOURCE rpm-%{V_rpm}.patch.regen`
       touch aclocal.m4 configure
-      cp `SOURCE getopt.c` misc/
-      cp misc/Makefile.am misc/Makefile.am.orig
-      sed -e 's;@LIBOBJS@;@LIBOBJS@ getopt.o;' \
-          <misc/Makefile.am.orig >misc/Makefile.am
-      cp misc/Makefile.in misc/Makefile.in.orig
-      sed -e 's;@LIBOBJS@;@LIBOBJS@ getopt.o;' \
-          <misc/Makefile.in.orig >misc/Makefile.in
-      cp rpmio/macro.c rpmio/macro.c.orig
-       # XXX      #       sed -e 's;getopt(;rpm_getopt(
-          <misc/Makefile.in.orig >misc/Makefile.in
     )
 
     #   apply OpenPKG patches to Bash distribution tree

vim/vim.spec

@@ -98,7 +98,7 @@ AutoReqProv:  no
     done
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" \
-        %{SOURCE rc.vimP} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+        %{SOURCE rc.vim} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files