Author: glen Date: Fri Mar 16 23:07:07 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- satisfy deps without suffix
---- Files affected:
SPECS:
gcc4.spec (1.438.2.4 -> 1.438.2.5)
---- Diffs:
================================================================
Index: SPECS/gcc4.spec
diff -u SPECS/gcc4.spec:1.438.2.4 SPECS/gcc4.spec:1.438.2.5
--- SPECS/gcc4.spec:1.438.2.4 Fri Mar 16 23:56:51 2007
+++ SPECS/gcc4.spec Sat Mar 17 00:07:02 2007
@@ -16,11 +16,11 @@
%undefine with_profiling
%endif
+%define sname gcc
Summary: GNU Compiler Collection: the C compiler and shared files
Summary(es): Colección de compiladores GNU: el compilador C y ficheros
compartidos
Summary(pl): Kolekcja kompilatorów GNU: kompilator C i pliki współdzielone
Summary(pt_BR): Coleçăo dos compiladores GNU: o compilador C e arquivos
compartilhados
-%define sname gcc
Name: %{sname}4
Version: 4.1.1
Release: 1
@@ -71,18 +71,20 @@
BuildRequires: flex
BuildRequires: gettext-devel
BuildRequires: glibc-devel >= 6:2.3
+BuildRequires: gmp-devel
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.211
BuildRequires: texinfo >= 4.1
BuildRequires: zlib-devel
-BuildRequires: gmp-devel
# AS_NEEDED directive for dynamic linker
# http://sources.redhat.com/ml/glibc-cvs/2005-q1/msg00614.html
# http://sources.redhat.com/ml/binutils/2005-01/msg00288.html
Requires: binutils >= 2:2.16.90.0.1-0.3
+Requires: libgcc = %{epoch}:%{version}-%{release}
Requires: libgcc4 = %{epoch}:%{version}-%{release}
+Provides: cpp = %{epoch}:%{version}-%{release}
Provides: cpp4 = %{epoch}:%{version}-%{release}
-BuildRoot: %{tmpdir}/%{sname}-%{version}-root-%(id -u -n)
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _slibdir /%{_lib}
@@ -123,6 +125,7 @@
Summary(pt_BR): Biblioteca runtime para o GCC
License: GPL with unlimited link permission
Group: Libraries
+Provides: libgcc = %{epoch}:%{version}-%{release}
%description -n libgcc4
Shared gcc library.
@@ -143,6 +146,7 @@
Summary(pt_BR): Suporte C++ para o gcc
Group: Development/Languages
Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: %{name}-c++ = %{epoch}:%{version}-%{release}
Obsoletes: egcc-c++
Obsoletes: egcs-c++
@@ -191,6 +195,7 @@
Summary(pt_BR): Biblioteca C++ GNU
License: GPL v2+ with free software exception
Group: Libraries
+Provides: libstdc++ = %{epoch}:%{version}-%{release}
Obsoletes: libg++
Obsoletes: libstdc++3
@@ -238,8 +243,9 @@
License: GPL v2+ with free software exception
Group: Development/Libraries
Requires: %{name}-c++4 = %{epoch}:%{version}-%{release}
-Requires: libstdc++4 = %{epoch}:%{version}-%{release}
Requires: glibc-devel
+Requires: libstdc++4 = %{epoch}:%{version}-%{release}
+Provides: libstdc++-devel = %{epoch}:%{version}-%{release}
Obsoletes: libg++-devel
Obsoletes: libstdc++3-devel
@@ -269,6 +275,7 @@
License: GPL v2+ with free software exception
Group: Development/Libraries
Requires: libstdc++4-devel = %{epoch}:%{version}-%{release}
+Provides: libstdc++-static = %{epoch}:%{version}-%{release}
%description -n libstdc++4-static
Static C++ standard library.
@@ -533,6 +540,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.438.2.5 2007/03/16 23:07:02 glen
+- satisfy deps without suffix
+
Revision 1.438.2.4 2007/03/16 22:56:51 glen
- c++ package suffix
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gcc4.spec?r1=1.438.2.4&r2=1.438.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
