summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/dolphin/dolphin-14.0.0.spec8
-rw-r--r--redhat/applications/dolphin/dolphin-3.5.13.2.spec11
-rw-r--r--redhat/applications/tdesvn/tdesvn-14.0.0.spec14
-rw-r--r--redhat/applications/tdesvn/tdesvn-3.5.13.2.spec15
4 files changed, 11 insertions, 37 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
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