RPM packaging: update tdevelop

2 files changed, 69 insertions, 78 deletions

diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index 7d15ac589..b89810ffe 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -1,72 +1,97 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdevelop (version R14.0.0)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+#  Remove qt-devel and qt3-devel and any kde*-devel on your system !
+#  Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 2
 %define tde_version 14.0.0
-
-# TDE specific building variables
+%define tde_pkg tdevelop
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
-
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-%define _docdir %{tde_docdir}
 
-Name:		trinity-tdevelop
+Name:		trinity-%{tde_pkg}
 Summary:	Integrated Development Environment for C++/C
 Version:	%{tde_version}
 Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
-License:	GPLv2
 Group:		Development/Tools
-
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org/
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Project
+#Packager:	Francois Andriot <francois.andriot@free.fr>
+
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	ftp://129.187.206.68/pub/unix/ide/tdevelop/c_cpp_reference-2.0.2_for_KDE_3.0.tar.bz2
 
-# [c_cpp_ref] Fix library directories detection
-Patch1: c_cpp_reference-2.0.2-config.patch
-
-# [c_cpp_ref] Fix installation of 'asm' files
-Patch4:	c_cpp_reference-2.0.2-install.patch
-
-Requires: %{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
-BuildRequires:	tqt3-apps-devel >= 3.5.0
-BuildRequires:	libtqt4-devel >= 2:4.2.0
-BuildRequires:	trinity-arts-devel >= 2:1.5.10
+BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
-Requires: make
-Requires: perl
-Requires: flex >= 2.5.4
+Obsoletes:	trinity-kdevelop < %{version}-%{release}
+Provides:	trinity-kdevelop = %{version}-%{release}
+
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	fdupes
+BuildRequires:	desktop-file-utils
+BuildRequires:	make
+
+Requires:	make
+Requires:	perl
 Requires:	tqt3-designer >= 3.5.0
 Requires:	libtqt3-mt-devel >= 3.5.0
-Requires: gettext
-Requires: ctags
+Requires:	gettext
+Requires:	ctags
 
-BuildRequires:	cmake >= 2.8
+
+# DB4 support
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	db4-devel
 %endif
+
+# FLEX support
 BuildRequires:	flex
-# FIXME: No CVS support in tdevelop? This is going to suck...
-# Requires kdesdk3.
+Requires: flex >= 2.5.4
+
+# SVN support
 BuildRequires:	subversion-devel
+
+# NEON support
 BuildRequires:	neon-devel
 
 # LDAP support
@@ -76,12 +101,9 @@ BuildRequires:	openldap2-devel
 BuildRequires:	openldap-devel
 %endif
 
-#ACL support
+# ACL support
 BuildRequires:	libacl-devel
 
-Obsoletes:	trinity-tdevelop < %{version}-%{release}
-Provides:	trinity-tdevelop = %{version}-%{release}
-
 %description
 The TDevelop Integrated Development Environment provides many features
 that developers need as well as providing a unified interface to programs
@@ -473,14 +495,14 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 %package devel
 Summary: Development files for %{name}
-Group: Development/Libraries
+Group:		Development/Libraries/Other
 Requires: %{name}-libs = %{version}-%{release}
 
 Obsoletes:	trinity-kdevelop-devel < %{version}-%{release}
 Provides:	trinity-kdevelop-devel = %{version}-%{release}
 
 %description devel
-%{summary}.
+This package contains the development files for tdevelop.
 
 %files devel
 %defattr(-,root,root,-)
@@ -507,7 +529,7 @@ Obsoletes:	trinity-kdevelop-libs < %{version}-%{release}
 Provides:	trinity-kdevelop-libs = %{version}-%{release}
 
 %description libs
-%{summary}.
+This package contains the libraries needed for the tdevelop programs.
 
 %files libs
 %defattr(-,root,root,-)
@@ -552,23 +574,14 @@ Provides:	trinity-kdevelop-libs = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
 ##########
 
 %prep
-%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1
-%patch1 -p0 -b .config
-%patch4 -p1
-
-%__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 -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
+%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 
 %build
@@ -581,18 +594,6 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-# c references
-pushd c_cpp_reference-2.0.2_for_KDE_3.0
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --with-extra-libs=%{tde_libdir}
-popd
-
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -605,6 +606,7 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
   \
@@ -621,18 +623,13 @@ fi
 
 %__make %{?_smp_mflags} || %__make
 
-# c references
-cd ..
-%__make %{?_smp_mflags} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
 %install
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
-%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
 
-# Moves C reference to correct location
-%__mv -f %{?buildroot}%{tde_tdedocdir}/HTML/en/kdevelop/reference %{?buildroot}%{tde_tdedocdir}/HTML/en/tdevelop/
-%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/kdevelop
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
 
 
 %clean
diff --git a/redhat/tdevelop/tdevelop-3.5.13.2.spec b/redhat/tdevelop/tdevelop-3.5.13.2.spec
index e2bbc05f3..0a2cd496c 100644
--- a/redhat/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/tdevelop/tdevelop-3.5.13.2.spec
@@ -39,10 +39,6 @@ Source1:	ftp://129.187.206.68/pub/unix/ide/KDevelop/c_cpp_reference-2.0.2_for_KD
 
 # [c_cpp_ref] Fix library directories detection
 Patch1: 	c_cpp_reference-2.0.2-config.patch
-# [kdevelop] fix FTBFS
-Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch
-# [kdevelop] Fix XDG menu
-Patch3:		tdevelop-3.5.13.2-fix_xdg_menu.patch
 # [c_cpp_ref] Fix installation of 'asm' files
 Patch4:		c_cpp_reference-2.0.2-install.patch
 
@@ -563,7 +559,7 @@ Provides:	trinity-kdevelop-libs = %{version}-%{release}
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -572,8 +568,6 @@ Provides:	trinity-kdevelop-libs = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1
 %patch1 -p0 -b .config
-%patch2 -p1
-%patch3 -p1 -b .xdgmenu
 %patch4 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"