Branch: master

561c07ab 2014-10-11 14:36:55 François Andriot
RPM Packaging: update tdebase
A redhat/tdebase/trinity-tdebase-rpmlintrc
M redhat/Makefile.r14
M redhat/build/build_rpm_package.sh
M redhat/extras/trinity-filesystem/trinity-filesystem.spec
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 662c49e..c453999 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -696,6 +696,9 @@
 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 12af765..9d8611d 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -68,6 +68,7 @@
   --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 4d96c96..0f14796 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -439,7 +439,7 @@
 %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 0000000..9584d7f
--- /dev/null
+++ b/redhat/tdebase/trinity-tdebase-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('permissions-file-setuid-bit', 0)
+setBadness('non-position-independent-executable', 0)