- upgrade to the brand-new Vim 6.2 - remove the vimXX subdir in <prefix>/share/vim/vimXX - document the specification a little bit more - simplify the subdir handling

vim/vim.spec

@@ -24,9 +24,9 @@
 ##
 
 #   package versions
-%define       V_vl  6.1
-%define       V_vs  61
-%define       V_pl  474
+%define       V_vl  6.2
+%define       V_vs  62
+%define       V_pl  0
 
 #   package information
 Name:         vim
@@ -38,7 +38,7 @@ Distribution: OpenPKG [CORE]
 Group:        Editor
 License:      Charityware
 Version:      %{V_vl}.%{V_pl}
-Release:      20030421
+Release:      20030601
 
 #   package options
 %option       with_x11        no
@@ -53,89 +53,12 @@ Source1:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-src2.tar.gz
 Source2:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt1.tar.gz
 Source3:      ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt2.tar.gz
 Source4:      rc.vim
-Patch1:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.1-100.gz
-Patch2:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.101-200.gz
-Patch3:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.201-300.gz
-Patch4:       ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.301-400.gz
-Patch401:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.401
-Patch402:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.402
-Patch403:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.403
-Patch404:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.404
-Patch405:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.405
-Patch406:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.406
-Patch407:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.407
-Patch408:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.408
-Patch409:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.409
-Patch410:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.410
-Patch411:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.411
-Patch412:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.412
-Patch413:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.413
-Patch414:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.414
-Patch415:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.415
-Patch416:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.416
-Patch417:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.417
-Patch418:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.418
-Patch419:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.419
-Patch420:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.420
-Patch421:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.421
-Patch422:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.422
-Patch423:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.423
-Patch424:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.424
-Patch425:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.425
-Patch426:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.426
-Patch427:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.427
-Patch428:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.428
-Patch429:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.429
-Patch430:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.430
-Patch431:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.431
-Patch432:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.432
-Patch433:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.433
-Patch434:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.434
-Patch435:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.435
-Patch436:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.436
-Patch437:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.437
-Patch438:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.438
-Patch439:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.439
-Patch440:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.440
-Patch441:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.441
-Patch442:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.442
-Patch443:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.443
-Patch444:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.444
-Patch445:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.445
-Patch446:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.446
-Patch447:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.447
-Patch448:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.448
-Patch449:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.449
-Patch450:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.450
-Patch451:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.451
-Patch452:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.452
-Patch453:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.453
-Patch454:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.454
-Patch455:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.455
-Patch456:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.456
-Patch457:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.457
-Patch458:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.458
-Patch459:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.459
-Patch460:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.460
-Patch461:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.461
-Patch462:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.462
-Patch463:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.463
-Patch464:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.464
-Patch465:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.465
-Patch466:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.466
-Patch467:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.467
-Patch468:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.468
-Patch469:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.469
-Patch470:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.470
-Patch471:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.471
-Patch472:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.472
-Patch473:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.473
-Patch474:     ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.474
+#   Patch1:   ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.001
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103
+BuildPreReq:  OpenPKG, openpkg >= 20030103, make
 PreReq:       OpenPKG, openpkg >= 20030103
 %if "%{with_x11}" == "yes"
 BuildPreReq:  X11, gtk
@@ -161,19 +84,18 @@ AutoReqProv:  no
     filename completion, on-line help, and visual selection.
 
 %prep
+    #   unpack base distribution parts
     %setup0 -q -c
     %setup1 -q -T -D -a 1
     %setup2 -q -T -D -a 2
     %setup3 -q -T -D -a 3
-    %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.1-100.gz |\
-        %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
-    %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.101-200.gz |\
-        %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
-    %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.201-300.gz |\
-        %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
-    %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.301-400.gz |\
-        %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
-    i=401
+
+    #   apply initial jumbo patches
+    #   %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.1-100.gz |\
+    #       %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
+
+    #   apply remaining single patches
+    i=1
     while [ $i -le %{V_pl} ]; do
         cat $RPM_SOURCE_DIR/%{V_vl}.`echo $i | awk '{ printf("%03d", $0); }'` |\
         %{l_patch} -p0 -E -t -s >/dev/null 2>&1 || true
@@ -181,62 +103,73 @@ AutoReqProv:  no
     done
 
 %build
-    ( cd vim%{V_vs}/src
-      CC="%{l_cc}" \
-      CFLAGS="%{l_cflags -O}" \
-      CPPFLAGS="%{l_cppflags}" \
-      LDFLAGS="%{l_ldflags}" \
-      ./configure \
-          --prefix=%{l_prefix} \
-          --with-tlib=termcap \
+    #   configure package
+    cd vim%{V_vs}/src
+    CC="%{l_cc}" \
+    CFLAGS="%{l_cflags -O}" \
+    CPPFLAGS="%{l_cppflags}" \
+    LDFLAGS="%{l_ldflags}" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --with-tlib=termcap \
 %if "%{with_x11}" == "yes"
-          --with-x \
-          --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
-          --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
-          --enable-gui=gtk \
-          --with-gtk-prefix=%{l_prefix} \
-          --disable-gtktest \
-          --without-gnome \
+        --with-x \
+        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
+        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+        --enable-gui=gtk \
+        --with-gtk-prefix=%{l_prefix} \
+        --disable-gtktest \
+        --without-gnome \
 %else
-          --without-x \
-          --disable-gui \
+        --without-x \
+        --disable-gui \
 %endif
 %if "%{with_features}" == "huge"
-          --with-features=huge \
+        --with-features=huge \
 %else
 %if "%{with_features}" == "big"
-          --with-features=big \
+        --with-features=big \
 %else
 %if "%{with_features}" == "small"
-          --with-features=small \
+        --with-features=small \
 %else
-          --with-features=normal \
+        --with-features=normal \
 %endif
 %endif
 %endif
 %if "%{with_multibyte}" == "yes"
-           --enable-multibyte \
+        --enable-multibyte \
 %endif
 %if "%{with_perl}" == "yes"
-           --enable-perlinterp=%{l_prefix}/bin/perl \
+        --enable-perlinterp=%{l_prefix}/bin/perl \
 %endif
 %if "%{with_python}" == "yes"
-           --enable-pythoninterp=%{l_prefix}/bin/python \
+        --enable-pythoninterp=%{l_prefix}/bin/python \
 %endif
-          --disable-nls
-      %{l_make} %{l_mflags -O}
-    )
+        --disable-nls
+    %{l_shtool} subst \
+        -e 's;^\(VIMRTDIR[^=]*=\).*;\1;' \
+        Makefile
+
+    #   build package
+    %{l_make} %{l_mflags -O}
 
 %install
+    #   perform package installation procedure
+    rm -rf $RPM_BUILD_ROOT
     ( cd vim%{V_vs}/src
-      rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags} install \
-          prefix=$RPM_BUILD_ROOT%{l_prefix}
-    )
+          prefix=$RPM_BUILD_ROOT%{l_prefix} )
+
+    #   strip down installation hierarchy
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/vim
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/xxd
     rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/xxd.1
-    for link in vi ex rview rvim view; do
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/vim/tools
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/vim/macros
+
+    #   add links for program runtime variants
+    for link in vi ex rview rvim view vimdiff; do
         rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/$link
         ln $RPM_BUILD_ROOT%{l_prefix}/bin/vim \
            $RPM_BUILD_ROOT%{l_prefix}/bin/$link
@@ -244,10 +177,14 @@ AutoReqProv:  no
         ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/vim.1 \
            $RPM_BUILD_ROOT%{l_prefix}/man/man1/$link.1
     done
+
+    #   install run-command script
     %{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.vim} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+
+    #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files