From 43ed3b6077952745b04a8c749726871f7cd76142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 27 Dec 2013 15:51:58 +0100 Subject: RPM Packaging: fix alternatives commands --- redhat/applications/tdesvn/tdesvn-3.5.13.2.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'redhat/applications/tdesvn/tdesvn-3.5.13.2.spec') diff --git a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec index 332db275e..6f6a3625c 100644 --- a/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec +++ b/redhat/applications/tdesvn/tdesvn-3.5.13.2.spec @@ -118,7 +118,8 @@ find . -name "*.cmake" -exec %__sed -i {} \ %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" @@ -157,19 +158,14 @@ export PATH="%{_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -C build - # Installs SVN protocols as alternatives %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn -%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol -%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol -%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol -%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol -%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol +# Locales %find_lang kdesvn @@ -250,11 +246,6 @@ fi %{tde_datadir}/services/ksvn+https.protocol %{tde_datadir}/services/ksvn+ssh.protocol %{tde_datadir}/services/ksvn.protocol -%{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}/services/svn+file.protocol_tdesvn %{tde_datadir}/services/svn+http.protocol_tdesvn %{tde_datadir}/services/svn+https.protocol_tdesvn -- cgit v1.2.1