RPM Packaging: update trinity-filesystem

5 files changed, 56 insertions, 17 deletions

diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 0ccdfa036..c89bf56f2 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -14,41 +14,65 @@ 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";;
-  "libart-lgpl") PKGNAME="libart_lgpl_2-2";;
-esac
 
-# Use the Trinity Prefix, or not.
+# Some runtime packages are prefixed with 'trinity-', some are not.
 case "${PKGNAME}" in
-  "trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";;
+  "trinity-"*|"qt3"|"tqt3"|"tqtinterface"|"python-qt3"|"esound"|*"-tqt"|"lib"*) PREFIX="";;
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac
 
-echo "${PREFIX}${PKGNAME}"
+# Runtime packages
+case "${PKGNAME}" in
+  # Some packages have different runtime name than source package.
+  "avahi-tqt") PKGRUNTIME="libavahi-tqt1";;
+  "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-0";;
+  "dbus-1-tqt") PKGRUNTIME="libdbus-1-tqt0";;
+  "esound") PKGRUNTIME="esound-libs";;
+  "koffice") PKGRUNTIME="trinity-koffice-suite";;
+  "libart-lgpl") PKGRUNTIME="libart_lgpl_2-2";;
+  "tqt3") PKGRUNTIME="libtqt3-mt";;
+  "tqtinterface") PKGRUNTIME="libtqt4";;
+  # Language package: install only French language package
+  "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGRUNTIME="${PKGNAME}-French";;
+  # Default case: runtime package has same name as source package
+  *) PKGRUNTIME="${PKGNAME}";;
+esac
+
+# Finally, display the runtime package name.
+echo "${PREFIX}${PKGRUNTIME}"
 
+# Development package.
 if [ -n "${DEVEL}" ]; then
   # Check if development package is required.
-  # Applications do NOT have development packages, except K3B
   case "${PKGCATEGORY}" in
+    # Applications do NOT have 'devel' package, except K3B.
     "applications") if [ "${PKGNAME}" != "k3b" ]; then exit 0; fi;;
+    # Extras packages do NOT have 'devel' package, except Akode
     "extras") if [ "${PKGNAME}" != "akode" ]; then exit 0; fi;;
   esac
-  # Other packags NOT having development package
+  
+  # Some other packags NOT having development package
   case "${PKGNAME}" in
     "hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;;
     "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl") exit 0;;
   esac
+
+  # Some package have specific development package.
+  case "${PKGNAME}" in
+    "avahi-tqt") PKGRUNTIME="libavahi-tqt-devel";;
+    "dbus-tqt") PKGRUNTIME="libdbus-tqt-1-devel";;
+    "dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
+    "esound") PKGDEVEL="esound-devel";;
+    "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
+    "tqt3") PKGDEVEL="tqt3-dev-tools";;
+    # Default case: development package has same name as runtime package, plus '-devel' suffix.
+    *) PKGDEVEL="${PKGRUNTIME}-devel";;
+  esac
+
+  # Finally, other packages do have a '-devel'
+  echo "${PREFIX}${PKGDEVEL}"
   
-  echo "${PREFIX}${PKGNAME}-devel"
 fi
 
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 4c2ec49b4..282561b98 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -166,6 +166,18 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/trinity
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/xdg/menus
 
+
+%post
+%if 0%{?suse_version}
+# Add setuid files in '/etc/permissions.local'
+for b in fileshareset kgrantpty kpac_dhcp_helper start_tdeinit; do
+  if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
+    echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
+  fi
+done
+%endif
+
+
 %changelog
 * Mon Jun 03 2013 Francois Andriot <[email protected]> - 14.0.0-1
 - Initial build for TDE R14
diff --git a/redhat/packages.el6 b/redhat/packages.el6
index 6d55e8cdb..c3482c8bc 100644
--- a/redhat/packages.el6
+++ b/redhat/packages.el6
@@ -34,6 +34,7 @@ doxygen
 emacs
 esound-devel
 exiv2-devel
+fdupes
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/packages.el7 b/redhat/packages.el7
index eca5edaba..c8eb67bdf 100644
--- a/redhat/packages.el7
+++ b/redhat/packages.el7
@@ -31,6 +31,7 @@ djvulibre-devel
 doxygen
 emacs
 exiv2-devel
+fdupes
 ffmpeg-devel
 fftw-devel
 file-devel
diff --git a/redhat/packages.oss b/redhat/packages.oss
index cb6bc6dd2..7a2a1a6a1 100644
--- a/redhat/packages.oss
+++ b/redhat/packages.oss
@@ -4,6 +4,7 @@ unixODBC-devel
 mesa-libGL-devel
 mesa-libGLU-devel
 udev-devel
+fdupes
 gnokii-devel
 gpgme-devel
 flex