From 561c07abb24521c4a9cb5cafe64c77b4a5fb01a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 11 Oct 2014 21:36:55 +0200
Subject: [PATCH] RPM Packaging: update tdebase

---
 redhat/Makefile.r14                                      | 3 +++
 redhat/build/build_rpm_package.sh                        | 1 +
 redhat/extras/trinity-filesystem/trinity-filesystem.spec | 2 +-
 redhat/tdebase/trinity-tdebase-rpmlintrc                 | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 redhat/tdebase/trinity-tdebase-rpmlintrc

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 662c49e62..c45399904 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -696,6 +696,9 @@ mathemagics:
 png2qrgb:
 	$(call buildpkg,extras/png2qrgb)
 
+scribus:
+	$(call buildpkg,extras/scribus)
+
 style-ia-ora:
 	$(call buildpkg,extras/style-ia-ora)
 
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index 12af765f4..9d8611dee 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -68,6 +68,7 @@ rpmbuild -ba \
   --define "tde_prefix /opt/trinity" \
   --define "preversion ${PREVERSION:-}" \
   --define "with_jack 1" \
+  --define "with_xscreensaver 1" \
   ${ARGS} \
   "${TEMPDIR}/${SPECFILE##*/}"
 RET=$?
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 4d96c9655..0f14796f7 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -439,7 +439,7 @@ done
 %post
 %if 0%{?suse_version}
 # Add setuid files in '/etc/permissions.local'
-for b in kgrantpty kpac_dhcp_helper start_tdeinit; do
+for b in kcheckpass kgrantpty kpac_dhcp_helper start_tdeinit tdmtsak tdekbdledsync ; do
   if ! grep -q "^%{tde_bindir}/${b}" "/etc/permissions.local"; then
     echo "%{tde_bindir}/${b}          root:root       4711" >>/etc/permissions.local
   fi
diff --git a/redhat/tdebase/trinity-tdebase-rpmlintrc b/redhat/tdebase/trinity-tdebase-rpmlintrc
new file mode 100644
index 000000000..9584d7f54
--- /dev/null
+++ b/redhat/tdebase/trinity-tdebase-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('permissions-file-setuid-bit', 0)
+setBadness('non-position-independent-executable', 0)