From 62da76f16a7da1c2a5303f1df7c0b578f80f3a06 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 16 2008 04:12:51 +0000 Subject: sync w/devel --- diff --git a/.cvsignore b/.cvsignore index 97b1049..c04ae26 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,2 @@ c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -kdevelop-3.3.4.tar.bz2 -kdevelop-3.4.1.tar.bz2 -kdevelop-3.5.0.tar.bz2 +kdevelop-3.5.1.tar.bz2 diff --git a/kdevelop-3.5.0-autosave.patch b/kdevelop-3.5.0-autosave.patch deleted file mode 100644 index 5e820bd..0000000 --- a/kdevelop-3.5.0-autosave.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp 2007/10/07 14:39:48 722530 -+++ branches/KDE/3.5/kdevelop/languages/cpp/cppsupportpart.cpp 2007/10/23 22:58:44 728690 -@@ -2533,6 +2533,9 @@ - QStringList l = files.res; - while(!l.isEmpty() ) { - emit addedSourceInfo( l.front() ); -+ emit aboutToRemoveSourceInfo( l.front() ); -+ emit removedSourceInfo( l.front() ); -+ emit addedSourceInfo( l.front() ); - l.pop_front(); - } - -@@ -2542,9 +2545,11 @@ - QStringList l = files.res; - while( !l.isEmpty() ) { - emit codeModelUpdated( l.front() ); -+ emit aboutToRemoveSourceInfo( l.front() ); -+ emit removedSourceInfo( l.front() ); -+ emit addedSourceInfo( l.front() ); - l.pop_front(); - } -- emit updatedSourceInfo(); - } - } - kdDebug( 9007 ) << "files in code-model after parseEmit: " << codeModel()->fileList().count() << " before: " << oldFileCount << endl; diff --git a/kdevelop.spec b/kdevelop.spec index 4399ffb..8eadfd1 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -7,11 +7,16 @@ %define make_cvs 1 +%if 0%{?fedora} > 7 +# make -libs subpkg +%define libs 1 +%endif + Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 3.5.0 -Release: 4%{?dist} +Version: 3.5.1 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -26,10 +31,18 @@ Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch Patch3: kdevelop-3.5.0-svn.patch #upstream patches -Patch500: kdevelop-3.5.0-autosave.patch Provides: kdevelop3 = %{version}-%{release} + +%if 0%{?libs} Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +%else +Obsoletes: %{name}-libs < %{?epoch:%{epoch}:}%{version}-%{release} +Provides: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +%endif + Requires: kdelibs3-devel >= %{kde_version} Requires: make @@ -53,8 +66,12 @@ BuildRequires: kdelibs-apidocs qt-devel-docs %global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version}) BuildRequires: db4-devel BuildRequires: flex +# FIXME: No CVS support in KDevelop? This is going to suck... +# Requires kdesdk3. +%if 0%{?fedora} < 9 # for cvs plugin -BuildRequires: kdesdk-devel +BuildRequires: kdesdk3-devel +%endif BuildRequires: subversion-devel neon-devel ## ancient, deprecated? -- Rex @@ -93,6 +110,7 @@ Requires: kdelibs3-devel %description devel %{summary}. +%if 0%{?libs} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries @@ -103,6 +121,7 @@ Obsoletes: %{name} < %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description libs %{summary}. +%endif @@ -112,7 +131,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %patch1 -p0 -b .config %patch2 -p1 -b .doc %patch3 -p1 -b .svn -%patch500 -p4 -b .autosave %if %{make_cvs} rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin @@ -148,7 +166,9 @@ popd --with-kdelibsdoc-dir=%{_docdir}/HTML/en/kdelibs-apidocs/ \ --with-extra-libs=%{_libdir} -make %{?_smp_mflags} +# parallel make disabled because otherwise main.cpp can get built before +# profileeditorbase.h is fully generated +make make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0 @@ -163,6 +183,7 @@ rm -rf %{buildroot}%{_prefix}/kdevbdb %post +%{!?libs:/sbin/ldconfig} for f in hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: @@ -170,15 +191,18 @@ done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun +%{!?libs:/sbin/ldconfig} for f in hicolor locolor ; do touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +%if 0%{?libs} %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig +%endif %clean @@ -202,8 +226,10 @@ rm -rf %{buildroot} %{_datadir}/services/* %{_datadir}/servicetypes/* +%if 0%{?libs} %files libs %defattr(-,root,root,-) +%endif %{_libdir}/lib*.so.* %{_libdir}/lib*.la @@ -214,8 +240,22 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2008 Kevin Kofler - 9:3.5.1-1 +- update to 3.5.1 (KDE 3.5.9) +- drop backported autosave patch (fixed upstream) + +* Sat Feb 09 2008 Kevin Kofler - 9:3.5.0-7 +- disable parallel make because of a race condition + +* Sat Feb 09 2008 Kevin Kofler - 9:3.5.0-6 +- rebuild for GCC 4.3 + +* Thu Dec 06 2007 Kevin Kofler - 9:3.5.0-5 +- drop CVS integration in F9+ for now because it requires kdesdk3 + * Tue Oct 31 2007 Rex Dieter - 9:3.5.0-4 - %%post/%%postun libs -p /sbin/ldconfig +- -libs conditional (f8+) * Tue Oct 30 2007 Rex Dieter - 9:3.5.0-3 - -devel, -libs subpkgs, multiarch conflicts (#341791) @@ -652,12 +692,12 @@ rm -rf %{buildroot} * Mon Apr 3 2000 Ngo Than - fix up reference (Bug #10368) -* Tue Feb 15 2000 Bernhard Rosenkr�nzer +* Tue Feb 15 2000 Bernhard Rosenkränzer - Fix up documentation path (Bug #7291) - Update to current stable branch - this should fix up the debugger problem - clean up spec file -* Fri Jan 6 2000 Bernhard Rosenkr�nzer +* Fri Jan 6 2000 Bernhard Rosenkränzer - Update to current stable branch - Adapt to 6.2 Qt libraries - Use BuildPrereq diff --git a/sources b/sources index 293feb9..65283a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -1101077b3a0164da463f60cad4f13e25 kdevelop-3.5.0.tar.bz2 +80d2216a0089fe142735d34ae8de6a0c kdevelop-3.5.1.tar.bz2