fix #100188, Fix incorrect 'endl' usage

This commit is contained in:
Than Ngo 2006-09-29 10:33:28 +00:00
parent ac114896c3
commit 7460c046d1
2 changed files with 15 additions and 0 deletions

View File

@ -0,0 +1,10 @@
--- kdelibs-3.5.4/kabc/Makefile.am.orig 2006-09-29 12:07:44.000000000 +0200
+++ kdelibs-3.5.4/kabc/Makefile.am 2006-09-29 12:06:01.000000000 +0200
@@ -55,6 +55,7 @@
kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
kab2kabc_LDADD = libkabc.la ../kab/libkab.la
kab2kabc_SOURCES = kab2kabc.cpp
+kab2kabc_COMPILE_FIRST = addressee.h
autostart_DATA = kab2kabc.desktop
autostartdir = $(datadir)/autostart

View File

@ -45,6 +45,7 @@ Patch34: kdelibs-3.4.0-qtdoc.patch
Patch35: kdelibs-3.4.92-inttype.patch
Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
Patch39: kdelibs-3.5.4-kabc-make.patch
# upstream patches
Patch100: kdelibs-3.5.4-kde#131933.patch
@ -65,6 +66,7 @@ Patch114: kdelibs-3.5.4-kde#133401.patch
Patch115: kdelibs-3.5.4-kde#131979.patch
Patch116: kdelibs-3.5.4-kde#115891.patch
Patch117: kdelibs-3.5.4-kde#123915.patch
Patch118: kdelibs-3.5.4-kde#100188.patch
%if %{arts}
Requires: arts >= %{arts_epoch}:%{arts_version}
@ -193,6 +195,7 @@ format for easy browsing
%patch35 -p1 -b .inttype
%patch37 -p1 -b .kdebug-kmail-quiet
%patch38 -p1 -b .cupsdconf2-group
%patch39 -p1 -b .kabc-make
# upstream pathces
%patch100 -p0 -b .kde#131933
@ -213,6 +216,7 @@ format for easy browsing
%patch115 -p0 -b .kde#131979
%patch116 -p0 -b .kde#115891
%patch117 -p0 -b .kde#123915
%patch118 -p0 -b .kde#100188
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
@ -445,6 +449,7 @@ fi
- fix #115891/bz#208270, CUPS 1.2.x unix socket support
- apply upstream patches
fix #123915, Page format display is 'overlaid'
fix #100188, Fix incorrect 'endl' usage
* Thu Sep 14 2006 Than Ngo <than@redhat.com> 6:3.5.4-7
- apply upstream patches