rpms/kdesdk/F-9 kdesdk-4.2.1-blockquote.patch, NONE, 1.1 .cvsignore, 1.46, 1.47 kdesdk.spec, 1.114, 1.115

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdesdk/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11294/F-9

Modified Files:
	.cvsignore kdesdk.spec 
Added Files:
	kdesdk-4.2.1-blockquote.patch 
Log Message:
sync devel/ changes to F-9/F-10 too


kdesdk-4.2.1-blockquote.patch:

--- NEW FILE kdesdk-4.2.1-blockquote.patch ---
diff -up kdesdk-4.2.1/poxml/parser.cpp.blockquote kdesdk-4.2.1/poxml/parser.cpp
--- kdesdk-4.2.1/poxml/parser.cpp.blockquote	2008-06-10 06:41:19.000000000 -0500
+++ kdesdk-4.2.1/poxml/parser.cpp	2009-02-27 11:40:35.000000000 -0600
@@ -49,7 +49,7 @@ static const char *cuttingtags[] = {"bri
 				    "othercredit", "affiliation", "qandaset",
 				    "cmdsynopsis", "funcsynopsis", "funcsynopsisinfo" ,
 				    "epigraph", "attribution", "glossary", "chapterinfo",
-				    "glossdiv", "blockingquote", "simplesect", "section",
+				    "glossdiv", "blockquote", "simplesect", "section",
 				    "qandadiv", "refsect1", "refmeta", "formalpara",
 				    "refentry", "refnamediv", "refpurpose", "refentrytitle",
                                     "refmiscinfo", "refsect2", "refsect3", "refsect1info",


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	9 Jan 2009 12:38:25 -0000	1.46
+++ .cvsignore	27 Feb 2009 19:07:44 -0000	1.47
@@ -1 +1,6 @@
-kdesdk-4.1.4.tar.bz2
+kdesdk-4.1.2.tar.bz2
+kdesdk-4.1.80.tar.bz2
+kdesdk-4.1.85.tar.bz2
+kdesdk-4.1.96.tar.bz2
+kdesdk-4.2.0.tar.bz2
+kdesdk-4.2.1.tar.bz2


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-9/kdesdk.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- kdesdk.spec	27 Feb 2009 18:38:57 -0000	1.114
+++ kdesdk.spec	27 Feb 2009 19:07:44 -0000	1.115
@@ -8,20 +8,18 @@
 License:        GPLv2
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-# upstream patches
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstreamable patches
+Patch50: kdesdk-4.2.1-blockquote.patch
+
 BuildRequires:  kdepimlibs-devel >= %{version}
 BuildRequires:  plasma-devel >= %{version}
 BuildRequires:  strigi-devel
 BuildRequires:  flex
-BuildRequires:  giflib-devel
 BuildRequires:  apr-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libxslt-devel
-BuildRequires:  openldap-devel
-BuildRequires:  pcre-devel
-BuildRequires:  libXtst-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  subversion-devel
 BuildRequires:  boost-devel
@@ -81,7 +79,8 @@
 %prep
 %setup -q
 
-# upstream patches
+%patch50 -p1 -b .blockquote
+
 
 %build
 mkdir -p %{_target_platform}
@@ -89,7 +88,7 @@
 %{cmake_kde4} ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
@@ -217,6 +216,7 @@
 %changelog
 * Fri Feb 27 2009 Than Ngo <than at redhat.com> - 4.2.1-1
 - 4.2.1
+- blockquote patch (#487624)
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild