upgrading package: gcc33 3.3.1s20030526 -> 3.3.1s20030602

gcc33/gcc33.spec

@@ -24,28 +24,29 @@
 ##
 
 #   package versions
-%define       V_major_dot    3.3.1
-%define       V_major_comp   33
-%define       V_snap_dash    2003-05-26
-%define       V_snap_comp    20030526
+%define       V_full         3.3.1
+%define       V_comp         33
+%define       V_snap_dash    2003-06-02
+%define       V_snap_comp    20030602
 
 #   package information
 Name:         gcc33
-Summary:      GNU Compiler Collection (%{V_major_dot})
+Summary:      GNU Compiler Collection (%{V_full})
 URL:          http://gcc.gnu.org/
 Vendor:       Free Software Foundation
 Packager:     The OpenPKG Project
 Distribution: OpenPKG [EVAL]
 Group:        Language
 License:      GPL
-Version:      %{V_major_dot}s%{V_snap_comp}
-Release:      20030527
+Version:      %{V_full}s%{V_snap_comp}
+Release:      20030603
 
 #   package options
 %option       with_cxx       yes
 %option       with_optimize  yes
 %option       with_binutils  yes
 %option       with_threads   yes
+%option       with_primary   no
 
 #   list of sources
 Source0:      ftp://gcc.gnu.org/pub/gcc/snapshots/%{V_snap_dash}/gcc-%{V_snap_comp}.tar.bz2
@@ -61,6 +62,9 @@ PreReq:       binutils >= 2.13
 %endif
 AutoReq:      no
 AutoReqProv:  no
+%if "%{with_primary}" == "yes"
+Provides:     gcc
+%endif
 
 %description
     The GNU Compiler Collection (GCC) provides a standard conforming and
@@ -109,9 +113,9 @@ AutoReqProv:  no
     ../configure \
         --prefix=%{l_prefix} \
         --exec-prefix=%{l_prefix} \
-        --includedir=%{l_prefix}/include/gcc%{V_major_comp} \
-        --with-gxx-include-dir=%{l_prefix}/include/g++%{V_major_comp} \
-        --with-local-prefix=%{l_prefix}/lib/gcc%{V_major_comp}-lib \
+        --includedir=%{l_prefix}/include/gcc%{V_comp} \
+        --with-gxx-include-dir=%{l_prefix}/include/g++%{V_comp} \
+        --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp}-lib \
         --enable-languages="${l_enable_languages}" \
         --enable-threads="${l_enable_threads}" \
         --disable-maintainer-mode \
@@ -121,7 +125,7 @@ AutoReqProv:  no
 
     #   explicitly redirect remaining gcc-lib directories
     %{l_shtool} subst -v -s \
-        -e "s;/gcc-lib/;/gcc%{V_major_comp}-lib/;" \
+        -e "s;/gcc-lib/;/gcc%{V_comp}-lib/;" \
         `find . -name Makefile -type f -print`
 
     #   determine build flags
@@ -175,9 +179,9 @@ AutoReqProv:  no
 
     #   cleanup installation tree
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
-       $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_major_comp}-lib/${triple}/%{V_major_dot}/
+       $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/
     mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
-       $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_major_comp}-lib/${triple}/%{V_major_dot}/include/ \
+       $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/ \
            >/dev/null 2>&1 || true
 
     #   strip installation tree
@@ -185,14 +189,13 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man7 >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la  >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc >/dev/null 2>&1 || true
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc-* >/dev/null 2>&1 || true
 %if "%{with_cxx}" == "yes"
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++ >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++ >/dev/null 2>&1 || true
 %endif
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     for prog in cc1 cc1plus collect2 cpp; do
-        strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_major_comp}-lib/${triple}/%{V_major_dot}/${prog} \
+        strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/${prog} \
             >/dev/null 2>&1 || true
     done
 
@@ -207,18 +210,20 @@ AutoReqProv:  no
 %endif
 
     #   resolve filename conflicts
+%if "%{with_primary}" != "yes"
     ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
       for file in *; do
-          mv ${file} ${file}%{V_major_comp}
+          mv ${file} ${file}%{V_comp}
       done )
     ( cd $RPM_BUILD_ROOT%{l_prefix}/info
       for file in *; do
-          mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_major_comp}\2;'`
+          mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
       done )
     ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
       for file in *; do
-          mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_major_comp}\2;'`
+          mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
       done )
+%endif
 
     #   determine installation file list
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}