diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-12-27 15:51:58 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-12-27 15:51:58 +0100 |
| commit | 43ed3b6077952745b04a8c749726871f7cd76142 (patch) | |
| tree | afc5f714f5bdb7754ed6a7eeb16b0a2e24e7a747 /redhat/applications/tdesvn | |
| parent | 5ffeb7a6799ee097cb794803e60116821102f305 (diff) | |
| download | tde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.tar.gz tde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.zip | |
RPM Packaging: fix alternatives commands
Diffstat (limited to 'redhat/applications/tdesvn')
| -rw-r--r-- | redhat/applications/tdesvn/tdesvn-14.0.0.spec | 14 | ||||
| -rw-r--r-- | redhat/applications/tdesvn/tdesvn-3.5.13.2.spec | 15 |
2 files changed, 5 insertions, 24 deletions
diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index 3e8199877..940099c17 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -158,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 %{tde_pkg} @@ -203,7 +198,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_tdesvn + %{tde_datadir}/services/${proto}.protocol_tdesvn || : done fi @@ -264,11 +259,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 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 |