summaryrefslogtreecommitdiffstats
path: root/redhat/extras
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/extras')
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec12
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec2
2 files changed, 10 insertions, 4 deletions
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 3c7745b27..f445562fc 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -95,6 +95,10 @@ echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf"
# Remove setuid bit on some binaries.
chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
+# Rename binary to avoid conflict with kde3
+mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
+
+
%clean
%__rm -rf $RPM_BUILD_ROOT
@@ -103,7 +107,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
%post
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
-%set_permissions %{_bindir}/fileshareset
+%set_permissions %{_bindir}/fileshareset2
%endif
@@ -115,16 +119,16 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
# Setuid program
%if 0%{?suse_version}
-%verify(not mode) %{_bindir}/fileshareset
+%verify(not mode) %{_bindir}/fileshareset2
%else
-%attr(4755,root,root) %{_bindir}/fileshareset
+%attr(4755,root,root) %{_bindir}/fileshareset2
%endif
%if 0%{?suse_version}
# Check permissions on setuid files (openSUSE specific)
%verifyscript
-%verify_permissions -e /usr/bin/fileshareset
+%verify_permissions -e %{_bindir}/fileshareset2
%endif
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 733f3ee3d..d4a0d78a3 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -165,7 +165,9 @@ Requires: trinity-konversation
Requires: trinity-kooldock
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
+%if 0%{?rhel} != 5
Requires: trinity-kpilot
+%endif
#Requires: trinity-kplayer
Requires: trinity-krecipes
Requires: trinity-krename