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: 28-May-2006 13:46:08
Branch: HEAD Handle: 2006052812460800
Modified files:
openpkg-src/gcc42 gcc42.spec
Log:
sync with new gcc package
Summary:
Revision Changes Path
1.20 +6 -4 openpkg-src/gcc42/gcc42.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc42/gcc42.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 gcc42.spec
--- openpkg-src/gcc42/gcc42.spec 28 May 2006 09:12:38 -0000 1.19
+++ openpkg-src/gcc42/gcc42.spec 28 May 2006 11:46:08 -0000 1.20
@@ -98,12 +98,14 @@
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
%{l_shtool} subst -v -s \
- -e 's;\(version_string\[\] = "[^"]*\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"});' \
+ -e 's;\(VERSUFFIX "\)\("\);\1 (%{l_openpkg_release -F
"OpenPKG-%%s"})\2;' \
-e 's;\(bug_report_url\[\] =
"\)[^"]*;\1<URL:http://www.openpkg.org/>;' \
gcc/version.c
- %{l_shtool} subst -v -s \
- -e 's;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;' \
- `find . -name Makefile.in -type f -print`
+ if [ ".%{V_comp}" != . ]; then
+ %{l_shtool} subst -v -s \
+ -e 's;(libdir)/gcc/;(libdir)/gcc%{V_comp}/;' \
+ `find . -name Makefile.in -type f -print`
+ fi
case "%{l_platform -t}" in
amd64*-linux* )
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
