From 12f7b1c79a6722d162b1e55bdbe047a644ad4962 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: May 19 2008 09:48:09 +0000 Subject: Sync from devel: 3.5.2-1 - update to 3.5.2 - F9+: BR qt3-devel-docs instead of qt-devel-docs - F9+: Require qt3-designer instead of qt-designer - drop backported fix_missing_output_kdev3.5.1 patch --- diff --git a/.cvsignore b/.cvsignore index c04ae26..4702920 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -kdevelop-3.5.1.tar.bz2 +kdevelop-3.5.2.tar.bz2 diff --git a/fix_missing_output_kdev3.5.1 b/fix_missing_output_kdev3.5.1 deleted file mode 100644 index e2a7482..0000000 --- a/fix_missing_output_kdev3.5.1 +++ /dev/null @@ -1,48 +0,0 @@ -Index: parts/outputviews/makewidget.cpp -=================================================================== ---- parts/outputviews/makewidget.cpp (Revision 780035) -+++ parts/outputviews/makewidget.cpp (Revision 780036) -@@ -532,28 +532,31 @@ - { - QString sline; - bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); -+ - if( forceCLocale ) - sline = QString::fromAscii( stdoutbuf+line ); - else - sline = QString::fromLocal8Bit( stdoutbuf+line ); -- stdoutbuf.truncate(0); - - if ( !appendToLastLine( sline ) ) - m_directoryStatusFilter.processLine( sline ); -+ stdoutbuf.truncate(0); - } - - void MakeWidget::insertStderrLine( const QCString& line ) - { - QString sline; - bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); -+ - if( forceCLocale ) { - sline = QString( stderrbuf+line ); - } - else - sline = QString::fromLocal8Bit( stderrbuf+line ); -+ -+ if ( !appendToLastLine( sline ) ) -+ m_errorFilter.processLine( sline ); - stderrbuf.truncate(0); -- if ( !appendToLastLine( line ) ) -- m_errorFilter.processLine( line ); - } - - void MakeWidget::slotProcessExited(KProcess *) -@@ -832,7 +835,7 @@ - - void MakeWidget::storePartialStdoutLine(const QCString & line) - { -- stderrbuf += line; -+ stdoutbuf += line; - } - - #include "makewidget.moc" diff --git a/kdevelop.spec b/kdevelop.spec index a2f60e6..0ea51bf 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -2,8 +2,11 @@ %define debug 0 %define final 1 -%define kde_version 3.5.8 -%define qt_version 3.3.8 +%define kde_version 3.5.9 +%define qt_version 3.3.8b +# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8 +#global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +%define qt_ver %{qt_version} %define make_cvs 1 @@ -15,15 +18,15 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 3.5.1 -Release: 3%{?dist} +Version: 3.5.2 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/ide/%{name}-%{version}.tar.bz2 Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 Patch1: c_cpp_reference-2.0.2-config.patch @@ -31,7 +34,6 @@ Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch Patch3: kdevelop-3.5.0-svn.patch #upstream patches -Patch100: fix_missing_output_kdev3.5.1 Provides: kdevelop3 = %{version}-%{release} @@ -50,21 +52,29 @@ Requires: make Requires: perl Requires: automake libtool Requires: flex >= 2.5.4 +%if 0%{?fedora} < 9 Requires: qt-designer +%else +Requires: qt3-designer +%endif Requires: gettext Requires: ctags ## Skip these, for now -- Rex #Requires(hint): htdig #Source3: kdevelop-htdig.conf -#Requires(hint): kdelibs-apidocs +#Requires(hint): kdelibs3-apidocs #Requires(hint): ark %if %{make_cvs} BuildRequires: automake libtool %endif BuildRequires: kdelibs3-devel >= %{kde_version} -BuildRequires: kdelibs-apidocs qt-devel-docs -%global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) +BuildRequires: kdelibs3-apidocs +%if 0%{?fedora} < 9 +BuildRequires: qt-devel-docs +%else +BuildRequires: qt3-devel-docs +%endif BuildRequires: db4-devel BuildRequires: flex # FIXME: No CVS support in KDevelop? This is going to suck... @@ -133,8 +143,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch2 -p1 -b .doc %patch3 -p1 -b .svn -%patch100 -p0 -b .output - %if %{make_cvs} rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin cp -a admin c_cpp_reference-2.0.2_for_KDE_3.0/ @@ -243,6 +251,16 @@ rm -rf %{buildroot} %changelog +* Mon May 19 2008 Kevin Kofler - 9:3.5.2-1 +- update to 3.5.2 +- F9+: BR qt3-devel-docs instead of qt-devel-docs +- F9+: Require qt3-designer instead of qt-designer +- drop backported fix_missing_output_kdev3.5.1 patch + +* Tue Mar 04 2008 Kevin Kofler - 9:3.5.1-4 +- BR kdelibs3-apidocs instead of kdelibs-apidocs +- hardcode qt_ver again because 3.3.8b reports itself as 3.3.8 + * Thu Feb 28 2008 Than Ngo 9:3.5.1-3 - apply upstream patch to fix outputview diff --git a/sources b/sources index 65283a8..aee3460 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -80d2216a0089fe142735d34ae8de6a0c kdevelop-3.5.1.tar.bz2 +21c5085a4af3577d1d15fd169eb672a2 kdevelop-3.5.2.tar.bz2