OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jun-2006 10:30:27
Branch: HEAD Handle: 2006062209302700
Modified files:
openpkg-src/gcc gcc.spec
Log:
upgrade to new l_openpkg_release usage and remove special with_gcc
stuff which should only exist in gccN packages
Summary:
Revision Changes Path
1.128 +4 -30 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.127 -r1.128 gcc.spec
--- openpkg-src/gcc/gcc.spec 28 May 2006 11:45:53 -0000 1.127
+++ openpkg-src/gcc/gcc.spec 22 Jun 2006 08:30:27 -0000 1.128
@@ -37,7 +37,7 @@
Group: Compiler
License: GPL
Version: %{V_full}
-Release: 20060528
+Release: 20060622
# package options
%option with_cxx yes
@@ -48,7 +48,6 @@
%option with_profile no
%option with_binutils yes
%option with_threads yes
-%option with_gcc no
# list of sources
Source0:
ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}/gcc-%{version}.tar.bz2
@@ -57,8 +56,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
-PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20060622, make
+PreReq: OpenPKG, openpkg >= 20060622
%if "%{with_binutils}" == "yes"
BuildPreReq: binutils >= 2.14
PreReq: binutils >= 2.14
@@ -73,9 +72,6 @@
%endif
AutoReq: no
AutoReqProv: no
-%if "%{with_gcc}" == "yes"
-Provides: gcc = %{version}-%{release}
-%endif
%description
The GNU Compiler Collection (GCC) provides a standard conforming and
@@ -97,7 +93,7 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"})\2;' \
+ -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%t"})\2;' \
-e 's;\(bug_report_url\[\] =
"\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
if [ ".%{V_comp}" != . ]; then
@@ -303,28 +299,6 @@
$RPM_BUILD_ROOT%{l_prefix}/man/man1/c++.1
%endif
- # resolve filename conflicts
-%if "%{with_gcc}" != "yes" && "%{V_comp}" != ""
- ( cd $RPM_BUILD_ROOT%{l_prefix}/bin
- for file in *; do
- [ ".$file" = ".*" ] && continue
- mv ${file} ${file}%{V_comp}
- done
- ) || exit $?
- ( cd $RPM_BUILD_ROOT%{l_prefix}/info
- for file in *; do
- [ ".$file" = ".*" ] && continue
- mv ${file} `echo ${file} | sed -e
's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
- done
- ) || exit $?
- ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1
- for file in *; do
- [ ".$file" = ".*" ] && continue
- mv ${file} `echo ${file} | sed -e
's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'`
- done
- ) || exit $?
-%endif
-
# determine installation file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
