diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-05-01 00:02:09 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-05-01 18:12:39 +0200 |
| commit | ab1604b61a44147623db257ebc0a92409c219bba (patch) | |
| tree | 2dc85fa83cec971eb0b7963f8201966ca3c52895 /redhat/extras | |
| parent | 527c25ae5e2339f390ea77800ba743436f5911fd (diff) | |
| download | tde-packaging-ab1604b61a44147623db257ebc0a92409c219bba.tar.gz tde-packaging-ab1604b61a44147623db257ebc0a92409c219bba.zip | |
RPM: update spec files after building 14.0.10
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/fileshareset/fileshareset.spec | 10 | ||||
| -rw-r--r-- | redhat/extras/trinity-desktop/trinity-desktop.spec | 9 | ||||
| -rw-r--r-- | redhat/extras/trinity-filesystem/trinity-filesystem.spec | 5 |
3 files changed, 19 insertions, 5 deletions
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec index d48421788..3c7745b27 100644 --- a/redhat/extras/fileshareset/fileshareset.spec +++ b/redhat/extras/fileshareset/fileshareset.spec @@ -92,11 +92,21 @@ export LDFLAGS="$LDFLAGS -pie" mkdir -p "${RPM_BUILD_ROOT}%{_sysconfdir}/security/" echo "RESTRICT=yes" > "${RPM_BUILD_ROOT}%{_sysconfdir}/security/fileshare.conf" +# Remove setuid bit on some binaries. +chmod 0755 "%{?buildroot}%{_bindir}/fileshareset" + %clean %__rm -rf $RPM_BUILD_ROOT +%post +%if 0%{?suse_version} +# Sets permissions on setuid files (openSUSE specific) +%set_permissions %{_bindir}/fileshareset +%endif + + %files %defattr(-,root,root,-) %{_bindir}/filesharelist diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index c7a868137..8e2871fb8 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -189,6 +189,10 @@ Requires: trinity-mplayerthumbs Requires: trinity-piklab Requires: trinity-potracegui #Requires: trinity-qalculate-tde +# On RHEL, lilypond is not available, so no rosegarden :'-( +%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} +Requires: trinity-rosegarden +%endif Requires: trinity-smb4k Requires: trinity-smartcardauth Requires: trinity-soundkonverter @@ -239,11 +243,6 @@ Obsoletes: trinity-tde-guidance-powermanager #Requires: trinity-gtk3-tqt-engine #Requires: trinity-qt4-tqt-theme-engine -# On RHEL 5/7, lilypond is not available, so no rosegarden :'-( -%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} -Requires: trinity-rosegarden -%endif - # Compiz-related stuff does not work (obsolete) #Requires: trinity-compizconfig-backend-kconfig #Requires: trinity-desktop-effects-kde diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 71645c704..d8c26507d 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -626,6 +626,11 @@ for b in kcheckpass kgrantpty kpac_dhcp_helper kppp start_tdeinit tdmtsak tdekbd echo "%{tde_bindir}/${b} root:root 4711" >>/etc/permissions.local fi done +for b in fileshareset ; do + if ! grep -q "^%{_bindir}/${b}" "/etc/permissions.local"; then + echo "%{_bindir}/${b} root:root 4711" >>/etc/permissions.local + fi +done %endif |