From aa0b846c06cf6b081a91a8d4e7dd3fb0bfe6ad4d Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 06:51:48 +0000
Subject: [PATCH] auto-import kdelibs-2.2.2-1  from kdelibs-2.2.2-1.src.rpm

---
 .cvsignore   |  3 +--
 kdelibs.spec | 45 ++++++++++++++++++---------------------------
 sources      |  3 +--
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f1f2e74..0fe79c7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-kdelibs-2.2-cvsfixes.patch.bz2
-kdelibs-2.2.tar.bz2
+kdelibs-2.2.2.tar.bz2
diff --git a/kdelibs.spec b/kdelibs.spec
index 4b5e615..912d74d 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -3,10 +3,10 @@
 %define is_release 1
 %define beta %{nil}
 %define cups %{nil}
-%define rel 15c
+%define rel 1
 %define debug 0
-%define DATE 20010908
-Version: 2.2
+%define DATE 20011031
+Version: 2.2.2
 %define ver %{version}%{beta}
 Summary: Various libraries for KDE.
 %if %{is_release}
@@ -18,27 +18,23 @@ Patch1: kdelibs-2.0-final.patch
 Patch2: kdelibs-2.0-nodebug.patch
 Patch3: klauncher-escape.patch
 Patch4: kdelibs-20010205-Japanese.patch
-Patch5: kdelibs-2.2-cookies.patch
+Patch5: kdelibs-2.2.1-cookies.patch
 Patch6: kdelibs-2.1-noxs.patch
 Patch7: kdelibs-2.1.1-debug.patch
 Patch8: kdelibs-2.1.1-cookieperms.patch
-Patch9: kdelibs-2.2-security.patch
 Patch10: kdelibs-2.2-ssl.patch
 Patch11: kdelibs-2.1.1-path.patch
-Patch12: kdelibs-2.2-libxslt.patch
-Patch13: kdelibs-2.2-cvsfixes.patch.bz2
 Patch14: khtml-onChange.patch
+Patch15: kdelibs-2.2.1-glib.patch
 # Japanese patches
 Patch100: http://www.kde.gr.jp/patch/kdelibs-2.2beta1-keditcl1-20010706.diff
 Patch101: http://www.kde.gr.jp/patch/kdelibs-2.2beta1-khtml-autoencode-ja-20010708.diff
-# Simplified Chinese patch
-Patch200: kdelibs-2.2-gbk.patch
 Name: %{pkg}
 Prefix: %{_prefix}
-Requires: qt >= 2.3.0 openssl
-BuildRequires: qt-devel >= 2.3.0
+Requires: qt >= 2.3.2 openssl
+BuildRequires: qt-devel >= 2.3.2
 Obsoletes: %{pkg}2
-BuildPrereq: flex >= 2.5.4a-13 kdoc >= 2.2-0.beta1.1 libxslt-devel >= 1.0.1
+BuildPrereq: flex >= 2.5.4a-13 kdoc >= %{version} libxslt-devel >= 1.0.7
 BuildPrereq: sgml-common openjade jadetex docbook-dtd31-sgml docbook-style-dsssl perl-SGMLSpm docbook-utils pcre-devel zlib-devel openssl-devel
 Icon: kde-icon.xpm
 Epoch: 6
@@ -68,7 +64,7 @@ mixing, and animation.
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
-Requires: qt-devel >= 2.2.3, %{name} = %{version}, pcre-devel
+Requires: qt-devel >= 2.3.2, %{name} = %{version}, pcre-devel
 Obsoletes: kdesupport-devel
 
 %description devel
@@ -121,9 +117,6 @@ rm -rf $RPM_BUILD_ROOT
 %else
 %setup -q -n %{pkg}
 %endif
-# Don't use the internal libxslt
-rm -rf kdoctools/libxslt
-%patch12 -p1 -b .libxslt
 
 %patch1 -p1 -b .final
 %if %{debug} == 0
@@ -135,15 +128,13 @@ rm -rf kdoctools/libxslt
 %patch5 -p1 -b .cookieesc
 %patch6 -p1 -b .noxs
 %patch8 -p1 -b .sec
-%patch9 -p1 -b .secur
 %patch11 -p1 -b .path
-%patch13 -p1
 %patch14 -p1 -b .onChange
+%patch15 -p1 -b .glib
 %patch10 -p1 -b .ssl
 
 %patch100 -p1 -b .jp1
 # # # patch101 -p1 -b .jp2
-%patch200 -p1 -b .gbk
 
 # Make the version number say what it should say
 perl -pi -e 's,#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING "%{version}-%{release}",g' kdecore/kapp.h
@@ -187,8 +178,6 @@ CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" ./configure \
 	--disable-debug \
 	--without-debug \
 	--enable-final \
-%else
-	--enable-debug \
 %endif
 	--with-distribution="Red Hat Linux $VERSION"
 
@@ -209,8 +198,6 @@ CXXFLAGS="$FLAGS" CFLAGS="$FLAGS" ./configure \
 %if "%{debug}" == "0"
 	--disable-debug \
 	--without-debug \
-%else
-	--enable-debug \
 %endif
 	--disable-shared \
 %ifnarch alpha
@@ -420,11 +407,15 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/lib/libartsc.a
 
 %changelog
-* Mon Dec 10 2001 Leon Ho <llch@redhat.com>
-- fix problems on gbk-0 locale
+* Tue Nov 20 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.2.2-1
+- 2.2.2
 
-* Fri Oct 26 2001 Leon Ho <llch@redhat.com> 
-- fix gbk locale
+* Wed Oct 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.2.2-0.cvs20011031.1
+- Fix build with current toolchain
+- Update to current CVS stable branch
+
+* Tue Sep 11 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.2.1-1
+- 2.2.1
 
 * Sat Sep  8 2001 Bernhard Rosenkraenzer <bero@redhat.com> 2.2-11
 - i18n fixes
diff --git a/sources b/sources
index 0b755e6..fabef70 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f0cfcdb2c7a1f6147dcebd282d51fd6d  kdelibs-2.2-cvsfixes.patch.bz2
-2aca0c00143f4f7bc1ee7afdbe892912  kdelibs-2.2.tar.bz2
+116e5f72c593c4cc2c4a169acf964ff6  kdelibs-2.2.2.tar.bz2