diff --git a/kdevelop-3.4.1-svn.patch b/kdevelop-3.4.1-svn.patch new file mode 100644 index 0000000..b10b8cc --- /dev/null +++ b/kdevelop-3.4.1-svn.patch @@ -0,0 +1,12 @@ +diff -up kdevelop-3.4.1/vcs/subversion/configure.in.in.svn kdevelop-3.4.1/vcs/subversion/configure.in.in +--- kdevelop-3.4.1/vcs/subversion/configure.in.in.svn 2007-05-14 02:41:14.000000000 -0500 ++++ kdevelop-3.4.1/vcs/subversion/configure.in.in 2007-08-29 17:49:34.000000000 -0500 +@@ -131,7 +131,7 @@ else + fi + dnl fi // end of if test -x "$SVNCONFIG"; then + +-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 377500c..b77f6b8 100644 --- a/kdevelop.spec +++ b/kdevelop.spec @@ -3,8 +3,6 @@ %define kde_version 3.5.7 %define qt_version 3.3.8 -%define qt_epoch 1 -%define kdelibs_epoch 6 %define make_cvs 1 @@ -12,9 +10,9 @@ Name: kdevelop Summary: Integrated Development Environment for C++/C Epoch: 9 Version: 3.4.1 -Release: 3%{?dist} +Release: 4%{?dist} -License: GPL +License: GPLv2 URL: http://www.kdevelop.org/ Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,15 +22,14 @@ 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.4.1-svn.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version} +Requires: kdelibs3-devel >= %{kde_version} Requires: make Requires: perl -Requires: libtool -Requires: automake -Requires: autoconf +Requires: automake libtool Requires: flex >= 2.5.4 Requires: qt-designer Requires: gettext @@ -46,7 +43,7 @@ Requires: ctags %if %{make_cvs} BuildRequires: automake libtool %endif -BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{kde_version} +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: db4-devel @@ -88,6 +85,7 @@ individual needs. %setup -q -a1 %patch1 -p0 -b .config %patch2 -p1 -b .doc +%patch3 -p1 -b .svn %if %{make_cvs} rm -rf c_cpp_reference-2.0.2_for_KDE_3.0/admin @@ -166,7 +164,7 @@ rm -rf %{buildroot} %{_includedir}/* %{_datadir}/applications/kde/* %{_datadir}/apps/* -%config %{_datadir}/config/* +%{_datadir}/config/* %{_datadir}/desktop-directories/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* @@ -177,6 +175,11 @@ rm -rf %{buildroot} %changelog +* Wed Aug 29 2007 Rex Dieter - 9:3.4.1-4 +- License: GPLv2 +- (Build)Requires: kdelibs3-devel kdesdk3-devel +- svn patch (#265481) + * Wed Aug 29 2007 Fedora Release Engineering - 9:3.4.1-3 - Rebuild for selinux ppc32 issue.