OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 03-Jun-2003 10:17:41
Branch: HEAD Handle: 2003060309173802
Modified files:
openpkg-re/vcheck vc.gcc33
openpkg-src/gcc33 gcc33.spec
openpkg-web news.txt
Log:
upgrading package: gcc33 3.3.1s20030526 -> 3.3.1s20030602
Summary:
Revision Changes Path
1.29 +1 -2 openpkg-re/vcheck/vc.gcc33
1.32 +23 -18 openpkg-src/gcc33/gcc33.spec
1.4691 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.gcc33
============================================================================
$ cvs diff -u -r1.28 -r1.29 vc.gcc33
--- openpkg-re/vcheck/vc.gcc33 28 May 2003 06:42:00 -0000 1.28
+++ openpkg-re/vcheck/vc.gcc33 3 Jun 2003 08:17:38 -0000 1.29
@@ -2,8 +2,7 @@
}
prog gcc33 = {
- comment = "rse: do not upgrade gcc to anything above 3.2.x; use gcc33 for 3.3.x
- needs investigation for whole OpenPKG"
- version = 20030526
+ version = 20030602
url = ftp://gcc.gnu.org/pub/gcc/snapshots/
regex = (\d+-\d+-\d+)
url = ftp://gcc.gnu.org/pub/gcc/snapshots/__NEWVER__/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc33/gcc33.spec
============================================================================
$ cvs diff -u -r1.31 -r1.32 gcc33.spec
--- openpkg-src/gcc33/gcc33.spec 27 May 2003 08:12:40 -0000 1.31
+++ openpkg-src/gcc33/gcc33.spec 3 Jun 2003 08:17:40 -0000 1.32
@@ -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 @@
%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 @@
../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 @@
# 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 @@
# 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 @@
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 @@
%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}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4690 -r1.4691 news.txt
--- openpkg-web/news.txt 2 Jun 2003 19:43:07 -0000 1.4690
+++ openpkg-web/news.txt 3 Jun 2003 08:17:39 -0000 1.4691
@@ -1,3 +1,4 @@
+03-Jun-2003: Upgraded package: P<gcc33-3.3.1s20030602-20030603>
02-Jun-2003: Upgraded package: P<fsl-1.1.0-1.2.3>
02-Jun-2003: Upgraded package: P<xalan-c-1.5-20030602>
02-Jun-2003: Upgraded package: P<dss-4.1.3-20030602>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
