summaryrefslogtreecommitdiffstats
path: root/redhat/kdevelop
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/kdevelop')
-rw-r--r--redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch11
-rw-r--r--redhat/kdevelop/trinity-kdevelop-3.5.12.spec3
-rw-r--r--redhat/kdevelop/trinity-kdevelop-3.5.13.spec22
3 files changed, 26 insertions, 10 deletions
diff --git a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
new file mode 100644
index 000000000..590aa40bf
--- /dev/null
+++ b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
@@ -0,0 +1,11 @@
+--- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI 2011-10-30 13:30:56.655489268 +0100
++++ kdevelop/kdevdesigner/designer/listeditor.ui.h 2011-10-30 13:31:00.782489292 +0100
+@@ -30,7 +30,7 @@
+ {
+ QListViewItem *i = new QListViewItem( listview, listview->lastItem() );
+ i->setRenameEnabled( 0, TRUE );
+- tqApp->processEvents();
++ qApp->processEvents();
+ i->startRename( 0 );
+ }
+
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
index a7504fbe2..6d963ec74 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.12.spec
@@ -143,7 +143,7 @@ Requires: %{name} = %{version}-%{release}
%build
-QTDIR="" && source /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
@@ -184,7 +184,6 @@ popd
%install
%__rm -rf %{buildroot}
-
%__make install DESTDIR=%{buildroot}
%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 32aef0d43..a3101cdf7 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -11,6 +11,7 @@
%endif
# TDE 3.5.13 specific variables
+BuildRequires: cmake >= 2.8
%define tde_libdir %{_libdir}/trinity
%define _default_patch_fuzz 2
@@ -24,10 +25,14 @@ Release: %{?release}%{?dist}%{?_variant}
License: GPLv2
-URL: http://www.kdevelop.org/
Group: Development/Tools
-Prefix: %{_prefix}
+Vendor: Trinity Project
+Packager: Francois Andriot <francois.andriot@free.fr>
+URL: http://www.trinitydesktop.org/
+
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdevelop-%{version}.tar.gz
Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
@@ -35,7 +40,10 @@ Source1: ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD
# RedHat Legacy patches
Patch1: c_cpp_reference-2.0.2-config.patch
-Patch100: svn.patch
+# TDE 3.5.13 patches
+## RHEL / Fedora RPM specific patches
+Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
+
Provides: kdevelop3 = %{version}-%{release}
@@ -45,14 +53,13 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
Requires: make
Requires: perl
-#Requires: automake libtool
Requires: flex >= 2.5.4
Requires: qt3-designer
Requires: gettext
Requires: ctags
-#BuildRequires: automake libtool
-BuildRequires: cmake >= 2.8
+BuildRequires: tqtinterface-devel
+BuildRequires: trinity-arts-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdelibs-apidocs
BuildRequires: qt3-devel-docs
@@ -116,8 +123,7 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n kdevelop -a1
%patch1 -p0 -b .config
-
-%patch100 -p1
+%patch2 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !