summaryrefslogtreecommitdiffstats
path: root/redhat/tdesdk/tdesdk-14.0.0.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-12-27 15:51:58 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-12-27 15:51:58 +0100
commit43ed3b6077952745b04a8c749726871f7cd76142 (patch)
treeafc5f714f5bdb7754ed6a7eeb16b0a2e24e7a747 /redhat/tdesdk/tdesdk-14.0.0.spec
parent5ffeb7a6799ee097cb794803e60116821102f305 (diff)
downloadtde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.tar.gz
tde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.zip
RPM Packaging: fix alternatives commands
Diffstat (limited to 'redhat/tdesdk/tdesdk-14.0.0.spec')
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec14
1 files changed, 2 insertions, 12 deletions
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index fade817ef..87f1bda6d 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -189,6 +189,7 @@ what the code typically looks like.
This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kapptemplate
+%defattr(-,root,root,-)
%{tde_bindir}/kapptemplate
%{tde_datadir}/apps/kapptemplate/
@@ -969,11 +970,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/svn+https.protocol_tdesdk
%{tde_datadir}/services/svn+ssh.protocol_tdesdk
%{tde_datadir}/services/svn.protocol_tdesdk
-%{tde_datadir}/services/svn+file.protocol
-%{tde_datadir}/services/svn+http.protocol
-%{tde_datadir}/services/svn+https.protocol
-%{tde_datadir}/services/svn+ssh.protocol
-%{tde_datadir}/services/svn.protocol
%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
@@ -1012,7 +1008,7 @@ if [ $1 -eq 0 ]; then
for proto in svn+file svn+http svn+https svn+ssh svn; do
update-alternatives --remove \
${proto}.protocol \
- %{tde_datadir}/services/${proto}.protocol_tdesdk
+ %{tde_datadir}/services/${proto}.protocol_tdesdk || :
done
fi
@@ -1137,12 +1133,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
-
-%__ln_s -f /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
-%__ln_s -f /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
-%__ln_s -f /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
-%__ln_s -f /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
-%__ln_s -f /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
%endif
# Removes useless stuff