diff --git a/.cvsignore b/.cvsignore index 4702920..68bc98a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -kdevelop-3.5.2.tar.bz2 +kdevelop-3.5.3.tar.bz2 diff --git a/kdevelop-3.5.0-svn.patch b/kdevelop-3.5.0-svn.patch deleted file mode 100644 index 39c7267..0000000 --- a/kdevelop-3.5.0-svn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdevelop-3.5.0/vcs/subversion/configure.in.in.svn kdevelop-3.5.0/vcs/subversion/configure.in.in ---- kdevelop-3.5.0/vcs/subversion/configure.in.in.svn 2007-10-08 04:50:02.000000000 -0500 -+++ kdevelop-3.5.0/vcs/subversion/configure.in.in 2007-10-13 21:00:21.000000000 -0500 -@@ -117,7 +117,7 @@ if test "x$with_subversion" != xno; then - AC_MSG_RESULT([not found]) - SVN_SUBDIR= - fi -- SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1" -+ SVN_LIB="$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_fs-1" - SVN_INCLUDE="$SVN_INCLUDE $APR_INCLUDE" - SVN_CPPFLAGS="$APR_CPPFLAGS $SVN_CPPFLAGS" - diff --git a/kdevelop.spec b/kdevelop.spec index fd3d17d..a6ec6bf 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -1,3 +1,4 @@ +%define _default_patch_fuzz 2 %define debug 0 %define final 1 @@ -18,8 +19,8 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.5.3 +Release: 1%{?dist} License: GPLv2 URL: http://www.kdevelop.org/ @@ -31,7 +32,6 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kdevelop-2.1.5_for_KDE_3.1-doc.patch -Patch3: kdevelop-3.5.0-svn.patch # improved integration for the KDE 4 template - no special KDE 4 build environment needed in Fedora Patch4: kdevelop-3.5.2-kde4template.patch @@ -86,6 +86,9 @@ BuildRequires: flex BuildRequires: kdesdk3-devel %endif BuildRequires: subversion-devel neon-devel +# looks like this is dragged in by apr-devel (dep of subversion-devel), but not +# a dependency +BuildRequires: openldap-devel ## ancient, deprecated? -- Rex #Obsoletes: kdevelop-c_c++_ref @@ -143,7 +146,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q -a1 %patch1 -p0 -b .config %patch2 -p1 -b .doc -%patch3 -p1 -b .svn %patch4 -p1 -b .kde4template %if %{make_cvs} @@ -254,6 +256,13 @@ rm -rf %{buildroot} %changelog +* Sat Aug 30 2008 Kevin Kofler - 9:3.5.3-1 +- update to 3.5.3 +- drop svn patch (fixed upstream) + +* Mon Jul 07 2008 Kevin Kofler - 9:3.5.2-3 +- fix FTBFS (add BR openldap-devel to work around missing dep in apr-devel) + * Fri Jun 06 2008 Kevin Kofler - 9:3.5.2-2 - improve integration of the KDE 4 app template diff --git a/sources b/sources index aee3460..5a8eb15 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 5777e4d2dbfc3e6c2ba9f0ed6ea457f9 c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2 -21c5085a4af3577d1d15fd169eb672a2 kdevelop-3.5.2.tar.bz2 +a2cdb5f71952386798175f8ce5a3e196 kdevelop-3.5.3.tar.bz2