summaryrefslogtreecommitdiffstats
path: root/redhat/tdesdk
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-12-28 20:29:52 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-12-28 20:29:52 +0100
commit4a3e6e0caf179b6ba22f5fb76a6208f3e84ceade (patch)
treecac0d48146738d2991bbeadbd50ecd956bdb31ff /redhat/tdesdk
parent173aeaded0e4e6ca4dee09ed401e3c483fd2ff7d (diff)
parentc55ee4f291ee28be12e57a83d59b050f3952258b (diff)
downloadtde-packaging-4a3e6e0caf179b6ba22f5fb76a6208f3e84ceade.tar.gz
tde-packaging-4a3e6e0caf179b6ba22f5fb76a6208f3e84ceade.zip
RPM Packaging: updates for R14
Diffstat (limited to 'redhat/tdesdk')
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec14
-rw-r--r--redhat/tdesdk/tdesdk-3.5.13.2.spec25
2 files changed, 3 insertions, 36 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
diff --git a/redhat/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec
index 92dd7f889..75172f4f7 100644
--- a/redhat/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec
@@ -972,16 +972,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
-%{_sysconfdir}/alternatives/svn+file.protocol
-%{_sysconfdir}/alternatives/svn+http.protocol
-%{_sysconfdir}/alternatives/svn+https.protocol
-%{_sysconfdir}/alternatives/svn+ssh.protocol
-%{_sysconfdir}/alternatives/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
@@ -1020,7 +1010,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
@@ -1149,19 +1139,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
-
-%__mkdir_p %{?buildroot}/etc/alternatives
-%__ln_s -f %{tde_datadir}/services/svn+file.protocol %{?buildroot}/etc/alternatives/svn+file.protocol
-%__ln_s -f %{tde_datadir}/services/svn+http.protocol %{?buildroot}/etc/alternatives/svn+http.protocol
-%__ln_s -f %{tde_datadir}/services/svn+https.protocol %{?buildroot}/etc/alternatives/svn+https.protocol
-%__ln_s -f %{tde_datadir}/services/svn+ssh.protocol %{?buildroot}/etc/alternatives/svn+ssh.protocol
-%__ln_s -f %{tde_datadir}/services/svn.protocol %{?buildroot}/etc/alternatives/svn.protocol
%endif
# Removes useless stuff