RPM Packaging: updates

6 files changed, 75 insertions, 32 deletions

diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index d55075ffa..cd8bb1662 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -38,6 +38,7 @@ rpmbuild -ba \
   --define "_buildrootdir ${BUILDROOTDIR}" \
   --define "_rpmdir ${RPMDIR}" \
   --define "_srcrpmdir ${SRPMDIR}" \
+  --define '_build_create_debug 1' \
   --define "tde_version ${TDE_VERSION}" \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION}" \
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index 609c88f0e..5a8e282b8 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -6,16 +6,7 @@ PKGNAME="${1##*/}"
 [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
 
 # Language package: install only French language package
-case ${PKGNAME} in
-  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";;
-  "koffice") PKGNAME="${PKGNAME}-suite";;
-  "trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
-  "qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
-  "curl") PKGNAME="trinity-libcurl";;
-  "esound") PKGNAME="esound-libs";;
-  "tqt3") PKGNAME="libtqt3-mt";;
-  "tqtinterface") PKGNAME="libtqt4";;
-esac
+PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
 
 VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)
 if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 1b3e8b2cb..8c9ac7307 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -13,12 +13,16 @@ PKGCATEGORY="${1%%/*}"
 PKGNAME="${1##*/}"
 DEVEL="$2"
 
+# Some RPM packages have different name than the source tarball.
 # Language package: install only French language package
 case "${PKGNAME}" in
   "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";;
   "koffice") PKGNAME="${PKGNAME}-suite";;
   "tqt3") PKGNAME="libtqt3-mt";;
   "tqtinterface") PKGNAME="libtqt4";;
+  "avahi-tqt") PKGNAME="libavahi-tqt";;
+  "dbus-tqt") PKGNAME="libdbus-tqt-1";;
+  "dbus-1-tqt") PKGNAME="libdbus-1-tqt";;
 esac
 
 # Use the Trinity Prefix, or not.
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index c74ac86fc..3d29ee9f0 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -1,32 +1,51 @@
+#
+# spec file for package libart-lgpl
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# 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/
+#
+
 # 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
 
+# TDE variables
 %define tde_version 14.0.0
-
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_datadir %{tde_prefix}/share
-
 %define tde_tdeincludedir %{tde_includedir}/tde
-
 %define _docdir %{tde_datadir}/doc
 
 
 Name:           trinity-libart-lgpl
 Version:        2.3.22
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-
 Summary:        Library of functions for 2D graphics - runtime files
-
 Group:          System Environment/Libraries
-License:        LGPLv2+
-
-Vendor:			Trinity Project
 URL:			http://www.trinitydesktop.org/
-Packager:		Francois Andriot <francois.andriot@free.fr>
+
+%if 0%{?suse_version}
+License:	LGPL-2.0+
+%else
+License:	LGPLv2+
+%endif
+
+#Vendor:			Trinity Project
+#Packager:		Francois Andriot <francois.andriot@free.fr>
 
 Prefix:			%{tde_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -36,6 +55,8 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 BuildRequires:  trinity-tqt3-devel >= 3.5.0
 BuildRequires:  trinity-tqtinterface-devel >= %{tde_version}
 
+BuildRequires:	gcc-c++
+
 %description
 A library of functions for 2D graphics supporting a superset of the
 PostScript imaging model, designed to be integrated with graphics, artwork,
@@ -45,10 +66,10 @@ especially suitable for embedded applications.
 
 
 %post
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %files
 %defattr(-,root,root,-)
@@ -70,10 +91,10 @@ compatible with C++. With a small footprint of 10,000 lines of code, it is
 especially suitable for embedded applications.
 
 %post devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %postun devel
-/sbin/ldconfig
+/sbin/ldconfig || :
 
 %files devel
 %defattr(-,root,root,-)
@@ -129,7 +150,7 @@ especially suitable for embedded applications.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 145f5ce7b..5462cff69 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -264,6 +264,8 @@ applications.
 %dir %{_libdir}/tqt3/plugins/inputmethods/
 %dir %{_libdir}/tqt3/plugins/sqldrivers/
 %dir %{_datadir}/tqt3/
+%dir %{_datadir}/tqt3/doc/
+%dir %{_datadir}/tqt3/doc/html/
 %dir %{_datadir}/tqt3/mkspecs/
 %dir %{_datadir}/tqt3/phrasebooks/
 %dir %{_datadir}/tqt3/templates/
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index f2d03d1ca..569329f79 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -1,13 +1,32 @@
-# Remove qt-devel and qt3-devel and any kde*-devel that may interfere !!!
+#
+# spec file for package tdelibs
+#
+# Copyright (c) 2014 François Andriot <francois.andriot@free.fr>
+#
+# 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 !
 
 # 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
 
+# TDE variables
 %define tde_version 14.0.0
-
-# TDE specific variables
+%define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
@@ -23,14 +42,19 @@
 Name:			trinity-tdelibs
 Version:		%{tde_version}
 Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
-License:		GPL
 Summary:		TDE Libraries
-Group:			Environment/Libraries
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
+Group:			System/GUI/Other
 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)