RPM: merge redhat directory with master branch

1 files changed, 31 insertions, 39 deletions

diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index 820d5af36..e958532c8 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdevelop (version R14.0.0)
+# spec file for package tdevelop (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,10 +21,13 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdevelop
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -38,7 +41,7 @@
 Name:		trinity-%{tde_pkg}
 Summary:	Integrated Development Environment for C++/C
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Group:		Development/Tools
 URL:		http://www.trinitydesktop.org/
 
@@ -55,6 +58,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 Requires:	%{name}-libs = %{version}-%{release}
 
@@ -119,15 +123,25 @@ BuildRequires:	subversion-devel
 # NEON support
 BuildRequires:	neon-devel
 
-# LDAP support
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
 %endif
 
-# ACL support
+# LIBACL support
+%if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	libacl-devel
+%endif
+
+# OPENSSL support
+BuildRequires:	openssl-devel
+
 
 %description
 The TDevelop Integrated Development Environment provides many features
@@ -159,9 +173,11 @@ individual needs.
 %{tde_bindir}/kdevdesigner
 %{tde_bindir}/tdevelop
 %{tde_bindir}/tdevelop-htdig
-%{tde_bindir}/kdevprj2tdevelop
+%{tde_bindir}/kdevprj2kdevelop
 %{tde_bindir}/kdevprofileeditor
 %{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
+%{tde_confdir}/kdevassistantrc
+%{tde_confdir}/tdeveloprc
 %{tde_tdeappdir}/kdevassistant.desktop
 %{tde_tdeappdir}/kdevdesigner.desktop
 %{tde_tdeappdir}/tdevelop.desktop
@@ -447,7 +463,6 @@ individual needs.
 %{tde_datadir}/apps/kdevdebugger/
 %{tde_datadir}/apps/kdevdesigner/
 %{tde_datadir}/apps/kdevdesignerpart/
-%{tde_datadir}/apps/kdevdesignerpart/
 %{tde_datadir}/apps/kdevdiff/
 %{tde_datadir}/apps/kdevdistpart/
 %{tde_datadir}/apps/kdevdocumentation/
@@ -481,8 +496,6 @@ individual needs.
 %{tde_datadir}/apps/kdevtrollproject/
 %{tde_datadir}/apps/kdevvalgrind/
 %{tde_datadir}/apps/tdeio_pydoc/
-%{tde_datadir}/config/kdevassistantrc
-%{tde_datadir}/config/tdeveloprc
 %{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
 %{tde_tdedocdir}/HTML/en/tdevelop/
 %{tde_libdir}/libd.so.0
@@ -498,20 +511,6 @@ individual needs.
 %{tde_datadir}/services/kdevvisualboyadvance.desktop
 %{tde_tdedocdir}/HTML/en/kdevdesigner/
 
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package devel
@@ -531,12 +530,6 @@ This package contains the development files for tdevelop.
 %{tde_libdir}/lib*.la
 %{tde_includedir}/*
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %package libs
@@ -587,12 +580,6 @@ This package contains the libraries needed for the tdevelop programs.
 %{tde_libdir}/libprofileengine.so.0
 %{tde_libdir}/libprofileengine.so.0.0.0
 
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -615,6 +602,12 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -632,6 +625,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -658,5 +652,3 @@ fi
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <[email protected]> - 14.0.0-1
-- Initial release for TDE 14.0.0