diff --git a/.cvsignore b/.cvsignore index 775de78..84a4e33 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ kdelibs-3.3.0.tar.bz2 kdelibs-3.3.1.tar.bz2 kdelibs-3.3.2.tar.bz2 +kdelibs-3.4.0-rc1.tar.bz2 diff --git a/kdelibs-3.3.92-defaultstyle.patch b/kdelibs-3.3.92-defaultstyle.patch new file mode 100644 index 0000000..f588ffb --- /dev/null +++ b/kdelibs-3.3.92-defaultstyle.patch @@ -0,0 +1,11 @@ +--- kdelibs-3.3.92/kdefx/kstyle.cpp.defaultstyle 2004-11-18 00:54:47.000000000 +0100 ++++ kdelibs-3.3.92/kdefx/kstyle.cpp 2005-02-14 18:13:11.584981009 +0100 +@@ -238,7 +238,7 @@ + QString KStyle::defaultStyle() + { + if (QPixmap::defaultDepth() > 8) +- return QString("plastik"); ++ return QString("Bluecurve"); + else + return QString("light, 3rd revision"); + } diff --git a/kdelibs.spec b/kdelibs.spec index 26d2cb0..f4bef4a 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -7,7 +7,7 @@ %define arts_version 1.3.0 %define kde_major_version 3 -%define libtool 1 +%define make_cvs 1 %define fam 1 %define dnotify 1 %define pcre 1 @@ -15,8 +15,8 @@ %define pie 1 %define arts 1 -Version: 3.3.2 -Release: 0.8 +Version: 3.4.0 +Release: 0.rc1.1 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -25,7 +25,7 @@ Group: System Environment/Libraries License: LGPL BuildRoot: %{_tmppath}/%{name}-buildroot -Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-rc1.tar.bz2 Source1: kde.sh Source2: kde.csh @@ -34,25 +34,13 @@ Patch2: kdelibs-3.0.0-ndebug.patch Patch3: kdelibs-3.2.0-icon.patch Patch4: kdelibs-3.0.4-ksyscoca.patch Patch5: kdelibs-3.3.0-openssl.patch -Patch15: kdelibs-3.1.95-buildroot.patch +Patch15: kdelibs-3.3.92-buildroot.patch Patch16: kdelibs-3.1-ssl-krb5.patch -Patch20: kdelibs-3.1-defaultstyle.patch -Patch22: kdelibs-3.1-kio.patch +Patch20: kdelibs-3.3.92-defaultstyle.patch Patch24: kdelibs-3.1-libtool.patch -Patch31: kdelibs-3.3.2-kate-immodule.patch Patch32: kdelibs-3.2.3-cups.patch Patch33: kdelibs-3.3.2-ppc.patch -# Upstreams patches -Patch101: kdelibs-3.3.2-arts.patch -Patch102: kdelibs-3.3.2-cleanup.patch - -# security fixes -# Patch200: KDE Security Advisory: plain text password exposure -Patch200: post-3.3.2-kdelibs-kio.diff -# Patch202: KDE Security Advisory: Konqueror Window Injection Vulnerability -Patch201: post-3.3.2-kdelibs-htmlframes2.patch - %if %{arts} Requires: arts >= 8:%{arts_version} %endif @@ -164,21 +152,10 @@ format for easy browsing. %patch15 -p1 -b .buildroot %patch16 -p1 -b .ssl-krb5 %patch20 -p1 -b .defaultstyle -%patch22 -p1 -b .kio %patch24 -p1 -b .libtool -%patch31 -p1 -b .im %patch32 -p1 -b .cups %patch33 -p1 -b .ppc -%patch101 -p1 -b .arts -%patch102 -p1 -b .cleanup - -# security fixes -pushd kio/kio -%patch200 -p0 -b .smb -popd -%patch201 -p0 -b .html2 - # add redhat into KDE_VERSION_STRING %if %{redhatify} perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h @@ -187,7 +164,7 @@ popd %build unset QTDIR && . /etc/profile.d/qt.sh -%if %{libtool} +%if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -355,7 +332,8 @@ exit 0 %attr(4755,root,root) %{_bindir}/kgrantpty /etc/profile.d/* /etc/xdg/menus/* -%{_bindir}/ghns +#%{_bindir}/ghns +%{_bindir}/kcmshell %{_bindir}/fileshareset %{_bindir}/khotnewstuff %{_bindir}/makekdewidgets @@ -417,6 +395,7 @@ exit 0 %{_datadir}/locale/all_languages %dir %{_datadir}/config %config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons %{_datadir}/icons %{_datadir}/mimelnk %{_datadir}/autostart @@ -435,8 +414,21 @@ exit 0 %doc %{_docdir}/HTML/en/kdelibs* %changelog -* Thu Feb 17 2005 Than Ngo 3.3.2-0.8 +* Sat Feb 26 2005 Than Ngo 6:3.4.0-0.rc1.1 +- bump release + +* Fri Feb 25 2005 Than Ngo 6:3.4.0-0.rc1.0 +- KDE 3.4.0 rc1 + +* Tue Feb 22 2005 Than Ngo 6:3.3.92-0.3 +- respin KDE 3.4 beta2 + +* Thu Feb 17 2005 Than Ngo 6:3.3.92-0.2 - Add symlinks to crystal icons, thanks Peter Rockai, #121929 +- fix export + +* Mon Feb 14 2005 Than Ngo 6:3.3.92-0.1 +- KDE 3.4 Beta2 * Sat Feb 12 2005 Than Ngo 6:3.3.2-0.7 - backport CVS patch, cleanup InputMethod diff --git a/sources b/sources index 432ab71..72129c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0473fb4c6c2cd2bc0f267cfa201f3fd8 kdelibs-3.3.2.tar.bz2 +f14bb378c1967df19919a9519e40fdcd kdelibs-3.4.0-rc1.tar.bz2