summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-11 21:36:55 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-11 21:36:55 +0200
commit561c07abb24521c4a9cb5cafe64c77b4a5fb01a6 (patch)
tree5bf51d1e6a44f03e738c1c9d26429f334f424996 /redhat
parent0e447a812a594d163e0c97077fcfc8053d84471b (diff)
downloadtde-packaging-561c07abb24521c4a9cb5cafe64c77b4a5fb01a6.tar.gz
tde-packaging-561c07abb24521c4a9cb5cafe64c77b4a5fb01a6.zip
RPM Packaging: update tdebase
Diffstat (limited to 'redhat')
-rw-r--r--redhat/Makefile.r143
-rwxr-xr-xredhat/build/build_rpm_package.sh1
-rw-r--r--redhat/extras/trinity-filesystem/trinity-filesystem.spec2
-rw-r--r--redhat/tdebase/trinity-tdebase-rpmlintrc2
4 files changed, 7 insertions, 1 deletions
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)