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 Date: 03-Jun-2003 12:24:49
Branch: HEAD Handle: 2003060311244800
Modified files:
openpkg-src/gcc33 gcc33.spec
Log:
reduce diff to 'gcc' package
Summary:
Revision Changes Path
1.33 +11 -11 openpkg-src/gcc33/gcc33.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc33/gcc33.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 gcc33.spec
--- openpkg-src/gcc33/gcc33.spec 3 Jun 2003 08:17:40 -0000 1.32
+++ openpkg-src/gcc33/gcc33.spec 3 Jun 2003 10:24:48 -0000 1.33
@@ -23,7 +23,7 @@
## SUCH DAMAGE.
##
-# package versions
+# package version
%define V_full 3.3.1
%define V_comp 33
%define V_snap_dash 2003-06-02
@@ -31,7 +31,7 @@
# package information
Name: gcc33
-Summary: GNU Compiler Collection (%{V_full})
+Summary: GNU Compiler Collection
URL: http://gcc.gnu.org/
Vendor: Free Software Foundation
Packager: The OpenPKG Project
@@ -46,7 +46,7 @@
%option with_optimize yes
%option with_binutils yes
%option with_threads yes
-%option with_primary no
+%option with_gcc no
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/snapshots/%{V_snap_dash}/gcc-%{V_snap_comp}.tar.bz2
@@ -62,8 +62,8 @@
%endif
AutoReq: no
AutoReqProv: no
-%if "%{with_primary}" == "yes"
-Provides: gcc
+%if "%{with_gcc}" == "yes"
+Provides: gcc = %{version}-%{release}
%endif
%description
@@ -186,12 +186,12 @@
# strip installation tree
rm -rf $RPM_BUILD_ROOT%{l_prefix}/${triple}
- 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 -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
%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
+ 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
@@ -210,7 +210,7 @@
%endif
# resolve filename conflicts
-%if "%{with_primary}" != "yes"
+%if "%{with_gcc}" != "yes" && "%{V_comp}" != ""
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for file in *; do
mv ${file} ${file}%{V_comp}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
