RPM Packaging: massive update

1 files changed, 22 insertions, 4 deletions

diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 60f270eee..a65a417ca 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -27,6 +27,7 @@
 %define tde_pkg tdelibs
 %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
@@ -63,7 +64,8 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:		%{name}-rpmlintrc
-Patch0:			%{tde_pkg}-%{tde_version}.patch
+
+Patch0:			tdelibs-14.0.1.patch
 
 Obsoletes:		tdelibs < %{version}-%{release}
 Provides:		tdelibs = %{version}-%{release}
@@ -124,6 +126,9 @@ BuildRequires:	libtiff-devel
 # OPENSSL support
 BuildRequires:	openssl-devel
 
+# ACL support
+BuildRequires:	libacl-devel
+
 # GLIB2 support
 BuildRequires:	glib2-devel
 
@@ -314,6 +319,9 @@ Requires:		%{cacert}
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 %define xt_devel libXt-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define xt_devel libxt-devel
+%endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
 ### New features in TDE R14
@@ -470,7 +478,6 @@ kimgio (image manipulation).
 %{tde_datadir}/applnk/tdeio_iso.desktop
 %{tde_datadir}/apps/*
 %exclude %{tde_datadir}/apps/ksgmltools2/
-%{tde_datadir}/config/*
 %{tde_datadir}/emoticons/*
 %{tde_datadir}/icons/crystalsvg/
 %{tde_datadir}/icons/default.tde
@@ -482,6 +489,9 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/common/*
 %{tde_tdedocdir}/HTML/en/tdespell/
 
+# Global Trinity configuration
+%config %{tde_confdir}
+
 # Some setuid binaries need special care
 %if 0%{?suse_version}
 %verify(not mode) %{tde_bindir}/kgrantpty
@@ -578,6 +588,13 @@ applications for TDE.
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 %patch0 -p1 -b .ftbfs
 
+# RHEL 5: remove tdehwlib stuff from include files, to avoid FTBFS in tdebindings
+%if 0%{?rhel} == 5
+%__sed -i "tdecore/kinstance.h" \
+       -i "tdecore/tdeglobal.h" \
+       -e "/#ifdef __TDE_HAVE_TDEHWLIB/,/#endif/d"
+%endif
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -607,6 +624,7 @@ fi
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DBIN_INSTALL_DIR="%{tde_bindir}" \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DDOC_INSTALL_DIR="%{tde_docdir}" \
   -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
@@ -698,5 +716,5 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/start_tdeinit"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
+- Initial release for TDE 14.0.1