SPECS: gnome-libs.spec - ac258 patch merged into am16 patch (which...

[qboosh]

Author: qboosh                       Date: Sun Aug 27 09:42:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ac258 patch merged into am16 patch (which introduced offending code)

---- Files affected:
SPECS:
   gnome-libs.spec (1.182 -> 1.183) 

---- Diffs:

================================================================
Index: SPECS/gnome-libs.spec
diff -u SPECS/gnome-libs.spec:1.182 SPECS/gnome-libs.spec:1.183
--- SPECS/gnome-libs.spec:1.182	Sun Aug 27 11:36:53 2006
+++ SPECS/gnome-libs.spec	Sun Aug 27 11:42:11 2006
@@ -28,11 +28,10 @@
 Patch9:		%{name}-ac253.patch
 Patch10:	%{name}-xterm-f1-f4.patch
 Patch11:	%{name}-locale-sp.patch
-Patch12:	%{name}-ac258.patch
-Patch13:	%{name}-libart2.patch
-Patch14:	%{name}-am18.patch
-Patch15:	%{name}-gcc4.patch
-Patch16:	%{name}-link.patch
+Patch12:	%{name}-libart2.patch
+Patch13:	%{name}-am18.patch
+Patch14:	%{name}-gcc4.patch
+Patch15:	%{name}-link.patch
 URL:		http://www.gnome.org/
 BuildRequires:	ORBit-devel >= 1:0.5.17-7
 BuildRequires:	audiofile-devel >= 1:0.2.0
@@ -273,7 +272,6 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
 
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at Latn}.po
@@ -428,6 +426,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2006/08/27 09:42:11  qboosh
+- ac258 patch merged into am16 patch (which introduced offending code)
+
 Revision 1.182  2006/08/27 09:36:53  qboosh
 - removed redundant macros-no_libnsl patch
 - require properly linked ORBit (>= 1:0.5.17-7)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-libs.spec?r1=1.182&r2=1.183&f=u