diff --git a/.cvsignore b/.cvsignore index 8a59f94..5e42e5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ kdelibs-3.3.0.tar.bz2 kdelibs-3.3.1.tar.bz2 kdelibs-3.3.2.tar.bz2 kdelibs-3.3.92.tar.bz2 +kdelibs-3.4.0-rc1.tar.bz2 diff --git a/kdelibs.spec b/kdelibs.spec index e1c88c7..94b7575 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -4,10 +4,10 @@ %define final 0 %define qt_version 3.3.3 -%define arts_version 1.3.0 +%define arts_version 1.4.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.92 -Release: 0.2 +Version: 3.4.0 +Release: 0.rc1.0 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 @@ -41,8 +41,6 @@ Patch24: kdelibs-3.1-libtool.patch Patch32: kdelibs-3.2.3-cups.patch Patch33: kdelibs-3.3.2-ppc.patch -Patch100: kdelibs-3.3.92-cvs.patch - %if %{arts} Requires: arts >= 8:%{arts_version} %endif @@ -157,7 +155,6 @@ format for easy browsing. %patch24 -p1 -b .libtool %patch32 -p1 -b .cups %patch33 -p1 -b .ppc -%patch100 -p1 -b .export # add redhat into KDE_VERSION_STRING %if %{redhatify} @@ -167,7 +164,7 @@ format for easy browsing. %build unset QTDIR && . /etc/profile.d/qt.sh -%if %{libtool} +%if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -335,7 +332,6 @@ exit 0 %attr(4755,root,root) %{_bindir}/kgrantpty /etc/profile.d/* /etc/xdg/menus/* -#%{_bindir}/ghns %{_bindir}/kcmshell %{_bindir}/fileshareset %{_bindir}/khotnewstuff @@ -417,6 +413,12 @@ exit 0 %doc %{_docdir}/HTML/en/kdelibs* %changelog +* 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 diff --git a/sources b/sources index 39807a0..72129c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -876196a4f16a5cbc2da5f4f8557d138a kdelibs-3.3.92.tar.bz2 +f14bb378c1967df19919a9519e40fdcd kdelibs-3.4.0-rc1.tar.bz2