From 33c6862b73a32f72dc572657eb34576f890b77b2 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Oct 06 2005 13:39:25 +0000 Subject: update to KDE 3.5 beta 1 --- diff --git a/.cvsignore b/.cvsignore index 506e62e..7066ebb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -6,3 +6,4 @@ kdevelop-3.2.0-rc1.tar.bz2 kdevelop-3.2.0.tar.bz2 kdevelop-3.2.1.tar.bz2 kdevelop-3.2.2.tar.bz2 +kdevelop-3.2.91.tar.bz2 diff --git a/kdevelop.spec b/kdevelop.spec index cdb484c..3245a01 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,8 +1,8 @@ %define debug 0 %define final 0 -%define kde_version 3.4.2 -%define qt_version 3.3.4 +%define kde_version 3.4.91 +%define qt_version 3.3.5 %define make_cvs 1 @@ -10,8 +10,8 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C -Version: 3.2.2 -Release: 2 +Version: 3.2.91 +Release: 1 Epoch: 9 URL: http://www.kdevelop.org/ Group: Development/Tools @@ -25,8 +25,6 @@ Source2: kdevelop Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kde-libtool.patch Patch3: kdevelop-2.1.5_for_KDE_3.1-doc.patch -Patch4: kdevelop-3.1.92-fpic.patch -Patch7: kdevelop-3.2.1-symbol.patch Patch8: kdevelop-3.2.2-uic.patch Prereq: /sbin/ldconfig @@ -74,8 +72,6 @@ individual needs. %patch1 -p0 -b .config %patch2 -p1 -b .libtool %patch3 -p1 -b .doc -%patch4 -p1 -%patch7 -p1 -b .symbol %patch8 -p1 -b .uic %build @@ -102,6 +98,14 @@ QTDIR="" && source /etc/profile.d/qt.sh export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" +# c references +pushd c_cpp_reference-2.0.2_for_KDE_3.0 +%configure \ + --with-qt-libraries=$QTDIR/lib \ + --with-qt-includes=$QTDIR/include \ + --with-extra-libs=%{_libdir} +popd + %configure \ --disable-rpath \ %if %{final} @@ -115,14 +119,6 @@ export FLAGS="$RPM_OPT_FLAGS -DNDEBUG -DNO_DEBUG -D_GNU_SOURCE" make %{?_smp_mflags} -C lib/util make %{?_smp_mflags} -# c references -pushd c_cpp_reference-2.0.2_for_KDE_3.0 -%configure \ - --with-qt-libraries=$QTDIR/lib \ - --with-qt-includes=$QTDIR/include \ - --with-extra-libs=%{_libdir} -popd - %install rm -rf $RPM_BUILD_ROOT @@ -148,6 +144,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %{_libdir}/kde3/* %{_libdir}/lib* +%{_libdir}/kconf_update_bin/* %{_includedir}/* %{_datadir}/applications/kde/* %{_datadir}/apps/* @@ -160,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/servicetypes/* %changelog +* Thu Oct 06 2005 Than Ngo 9:3.2.91-1 +- update to KDE 3.5 beta 1 + * Thu Sep 22 2005 Than Ngo 9:3.2.2-2 - fix uic build problem diff --git a/sources b/sources index 383ecfa..fe2d087 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -6d788b8ec89ea9b19f5c281a574b48fe kdevelop-3.2.2.tar.bz2 +c5a3d4592fb36f305a2ea03aea60d36d kdevelop-3.2.91.tar.bz2