packages (AC-branch): gcc4/gcc4.spec - allow upgrading to g++ devel package...

[glen]

Author: glen                         Date: Mon Dec 27 22:43:33 2010 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- allow upgrading to g++ devel packages in builder; rel 10

---- Files affected:
packages/gcc4:
   gcc4.spec (1.438.2.21 -> 1.438.2.22) 

---- Diffs:

================================================================
Index: packages/gcc4/gcc4.spec
diff -u packages/gcc4/gcc4.spec:1.438.2.21 packages/gcc4/gcc4.spec:1.438.2.22
--- packages/gcc4/gcc4.spec:1.438.2.21	Mon Dec 27 23:19:31 2010
+++ packages/gcc4/gcc4.spec	Mon Dec 27 23:43:28 2010
@@ -21,7 +21,7 @@
 Summary(pt_BR.UTF-8):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		%{sname}4
 Version:	4.1.2
-Release:	9
+Release:	10
 Epoch:		5
 License:	GPL v2+
 Group:		Development/Languages
@@ -147,6 +147,7 @@
 Provides:	%{name}-c++ = %{epoch}:%{version}-%{release}
 Obsoletes:	egcc-c++
 Obsoletes:	egcs-c++
+Obsoletes:	gcc-c++ < %{epoch}:%{version}-%{release}
 
 %description c++
 This package adds C++ support to the GNU Compiler Collection. It
@@ -245,6 +246,7 @@
 Requires:	libstdc++4 = %{epoch}:%{version}-%{release}
 Provides:	libstdc++-devel = %{epoch}:%{version}-%{release}
 Obsoletes:	libg++-devel
+Obsoletes:	libstdc++-devel < %{epoch}:%{version}-%{release}
 Obsoletes:	libstdc++3-devel
 
 %description -n libstdc++4-devel
@@ -473,16 +475,16 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/libmudflapth.so.0.0.0
 
 # remove empty language catalogs (= 1 message only)
-find $RPM_BUILD_ROOT%{_datadir}/locale -type f -name '*.mo' | xargs file | egrep ', 1 messages$' | cut -d: -f1 | xargs rm -vf
+find $RPM_BUILD_ROOT%{_datadir}/locale -type f -name '*.mo' | xargs file | grep -E ', 1 messages$' | cut -d: -f1 | xargs rm -vf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post	-p /sbin/ldconfig -n libgcc4
 %postun	-p /sbin/ldconfig -n libgcc4
@@ -576,6 +578,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.438.2.22  2010/12/27 22:43:28  glen
+- allow upgrading to g++ devel packages in builder; rel 10
+
 Revision 1.438.2.21  2010/12/27 22:19:31  glen
 - utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gcc4/gcc4.spec?r1=1.438.2.21&r2=1.438.2.22&f=u