From 227df1637413f7cc7d7fc995c2e293f1fa2029a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 28 May 2021 20:18:46 +0200 Subject: RPM: more updates for centos5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/extras/fileshareset/fileshareset.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'redhat/extras/fileshareset') 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 -- cgit v1.2.1