RHEL/Fedora: massive updates for Fedora 17 (TDE 3.5.13 entire build)

3 files changed, 19 insertions, 26 deletions

diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch b/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch
index 3d534df91..84cc4726e 100644
--- a/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch
+++ b/redhat/kdevelop/c_cpp_reference-2.0.2-config.patch
@@ -1,7 +1,7 @@
 --- c_cpp_reference-2.0.2_for_KDE_3.0/configure.orig	Mon Dec  9 18:35:50 2002
 +++ c_cpp_reference-2.0.2_for_KDE_3.0/configure	Mon Dec  9 18:41:16 2002
-@@ -5868,7 +5868,7 @@
- So, check this please and use another prefix!" 1>&2; exit 1; }
+@@ -8768,7 +8768,7 @@
+    { (exit 1); exit 1; }; }
  fi
  
 -kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde2/lib /opt/kde/lib /usr/X11R6/kde/lib"
diff --git a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
index 590aa40bf..ef2da77f9 100644
--- a/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
+++ b/redhat/kdevelop/kdevelop-3.5.13-kdevdesigner-ftbfs.patch
@@ -2,7 +2,7 @@
 +++ 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() );
+     TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() );
      i->setRenameEnabled( 0, TRUE );
 -    tqApp->processEvents();
 +    qApp->processEvents();
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 79a037dfb..b4717ecfa 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -1,29 +1,18 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 3
-
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific variables
-BuildRequires:	cmake >= 2.8
 %define tde_docdir %{_docdir}/kde
 %define tde_includedir %{_includedir}/kde
 %define tde_libdir %{_libdir}/trinity
 
-%define _default_patch_fuzz 2
-%define qt_version 3.3.8d
-%define qt_ver %{qt_version}
-
 Name:    trinity-kdevelop
 Summary: Integrated Development Environment for C++/C
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 3.5.13
+Release: 3%{?dist}%{?_variant}
 
 
 License: GPLv2
@@ -39,15 +28,16 @@ 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
 
-# RedHat Legacy patches
+# [c_cpp_ref] Fix library directories detection
 Patch1: c_cpp_reference-2.0.2-config.patch
 
-# TDE 3.5.13 patches
-## RHEL / Fedora RPM specific patches
+# [kdevelop] fix FTBFS
 Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
-# Fix compilation with GCC 4.7
+
+# [kdevelop] Fix compilation with GCC 4.7 [Bug #958]
 Patch3: kdevelop-3.5.13-gcc47.patch
-# Fix installation of 'asm' files
+
+# [c_cpp_ref] Fix installation of 'asm' files
 Patch4:	c_cpp_reference-2.0.2-install.patch
 
 Provides: kdevelop3 = %{version}-%{release}
@@ -63,6 +53,7 @@ Requires: qt3-designer
 Requires: gettext
 Requires: ctags
 
+BuildRequires: cmake >= 2.8
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
 BuildRequires: trinity-kdelibs-devel
@@ -134,13 +125,15 @@ Requires: %{name} = %{version}-%{release}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
+%__sed -i "admin/acinclude.m4.in" \
   -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
 
+%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 
 %__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/
+%__cp -ar admin c_cpp_reference-2.0.2_for_KDE_3.0/
 %__make -C c_cpp_reference-2.0.2_for_KDE_3.0 -f admin/Makefile.common cvs
 
 
@@ -154,8 +147,8 @@ export LD_LIBRARY_PATH="%{_libdir}"
 # c references
 pushd c_cpp_reference-2.0.2_for_KDE_3.0
 %configure \
-  --with-qt-libraries=$QTDIR/lib \
-  --with-qt-includes=$QTDIR/include \
+  --with-qt-libraries=${QTLIB} \
+  --with-qt-includes=${QTINC} \
   --with-extra-libs=%{_libdir}
 popd