SPECS (AC-DEVEL): poldek.spec - HEAD merges

[glen]

Author: glen                         Date: Mon Jan 26 17:14:48 2009 GMT
Module: SPECS                         Tag: AC-DEVEL
---- Log message:
- HEAD merges

---- Files affected:
SPECS:
   poldek.spec (1.315.2.15 -> 1.315.2.16) 

---- Diffs:

================================================================
Index: SPECS/poldek.spec
diff -u SPECS/poldek.spec:1.315.2.15 SPECS/poldek.spec:1.315.2.16
--- SPECS/poldek.spec:1.315.2.15	Mon Jan 26 18:11:04 2009
+++ SPECS/poldek.spec	Mon Jan 26 18:14:42 2009
@@ -38,10 +38,11 @@
 Patch8:		%{name}-keep-reinstalled-provides.patch
 Patch9:		%{name}-dont-ask-for-suggests-on-errors.patch
 Patch10:	%{name}-crash-on-invalid-locale.patch
-Patch11:	%{name}-up_mini18n.patch
+Patch11:	%{name}-noutf8.patch
 Patch12:	%{name}-dont-suggests-required-packages.patch
 Patch13:	%{name}-tty-for-erasures.patch
-Patch14:	%{name}-317130.patch
+Patch14:	%{name}-both_langs.patch
+Patch15:	%{name}-317130.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -179,10 +180,11 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p1
-#%patch11 -p1
+%patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -410,6 +412,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315.2.16  2009/01/26 17:14:42  glen
+- HEAD merges
+
 Revision 1.315.2.15  2009/01/26 17:11:04  glen
 - changes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/poldek.spec?r1=1.315.2.15&r2=1.315.2.16&f=u