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/dolphin | |
| parent | 5ffeb7a6799ee097cb794803e60116821102f305 (diff) | |
| download | tde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.tar.gz tde-packaging-43ed3b6077952745b04a8c749726871f7cd76142.zip | |
RPM Packaging: fix alternatives commands
Diffstat (limited to 'redhat/applications/dolphin')
| -rw-r--r-- | redhat/applications/dolphin/dolphin-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/applications/dolphin/dolphin-3.5.13.2.spec | 11 |
2 files changed, 6 insertions, 13 deletions
diff --git a/redhat/applications/dolphin/dolphin-14.0.0.spec b/redhat/applications/dolphin/dolphin-14.0.0.spec index f7b25e799..2553b1a95 100644 --- a/redhat/applications/dolphin/dolphin-14.0.0.spec +++ b/redhat/applications/dolphin/dolphin-14.0.0.spec @@ -97,13 +97,10 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - # Makes 'media_safelyremove.desktop' an alternative %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin -%__ln_s %{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop -%__mkdir_p %{?buildroot}%{_sysconfdir}/alternatives -%__ln_s %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin +# Locales %find_lang d3lphin @@ -125,7 +122,7 @@ update-alternatives --install \ if [ $1 -eq 0 ]; then update-alternatives --remove \ media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin + %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || : fi %postun @@ -142,7 +139,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/apps/d3lphin/ %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ -%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %changelog diff --git a/redhat/applications/dolphin/dolphin-3.5.13.2.spec b/redhat/applications/dolphin/dolphin-3.5.13.2.spec index 5ba78e34d..660674e4e 100644 --- a/redhat/applications/dolphin/dolphin-3.5.13.2.spec +++ b/redhat/applications/dolphin/dolphin-3.5.13.2.spec @@ -69,7 +69,8 @@ interface for the task of file management. %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" %configure \ @@ -96,13 +97,10 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} - # Makes 'media_safelyremove.desktop' an alternative %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin -%__ln_s %{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop -%__mkdir_p %{?buildroot}%{_sysconfdir}/alternatives -%__ln_s %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin +# Locales %find_lang d3lphin @@ -124,7 +122,7 @@ update-alternatives --install \ if [ $1 -eq 0 ]; then update-alternatives --remove \ media_safelyremove.desktop_d3lphin \ - %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin + %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || : fi %postun @@ -141,7 +139,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/apps/d3lphin/ %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ -%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %changelog |