RHEL/Fedora: lots of updates

2 files changed, 106 insertions, 7 deletions

diff --git a/redhat/applications/kio-umountwrapper/media_safelyremove.desktop b/redhat/applications/kio-umountwrapper/media_safelyremove.desktop
new file mode 100644
index 000000000..22b716ad5
--- /dev/null
+++ b/redhat/applications/kio-umountwrapper/media_safelyremove.desktop
@@ -0,0 +1,74 @@
+[Desktop Entry]
+ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
+Actions=MediaSafelyRemove;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaSafelyRemove]
+Name=Safely Remove
+Name[af]=Verwyder veilig
+Name[ar]=أحذف بأمان
+Name[be]=Бяспечна адлучыць
+Name[bg]=Безопасно изваждане
+Name[bn]=নিরাপদভাবে সরাও
+Name[bs]=Sigurno ukloni
+Name[ca]=Extreu amb seguretat
+Name[cs]=Bezpečně odstranit
+Name[csb]=Remôj na bezpieczny ôrt
+Name[da]=Fjern sikkert
+Name[de]=Sicher entfernen
+Name[el]=Ασφαλής αφαίρεση
+Name[eo]=Sekura Forigo
+Name[es]=Extracción segura
+Name[et]=Eemalda turvaliselt
+Name[eu]=Atera arriskurik gabe
+Name[fa]=حذف امن
+Name[fi]=Poista turvallisesti
+Name[fr]=Enlever en toute sécurité
+Name[fy]=Feilich ferwiderje
+Name[ga]=Bain Amach go Sábháilte
+Name[gl]=Eliminar de Maneira Segura
+Name[he]=שליפה בבטחה
+Name[hr]=Slobodno uklonite
+Name[hu]=Biztonságos leválasztás
+Name[is]=Fjarlægja öruggt
+Name[it]=Rimozione sicura
+Name[ja]=安全に取り除く
+Name[kk]=Қауіпсіз алып шығу
+Name[km]=យកចេញ​ដោយ​សុវត្ថិភាព
+Name[lt]=Saugiai pašalinti
+Name[mk]=Безбедно отстрани
+Name[ms]=Buang Dengan Selamat
+Name[nb]=Sikker fjerning
+Name[nds]=Seker rutnehmen
+Name[ne]=सुरक्षीत रुपमा हटाउनुहोस्
+Name[nl]=Veilig verwijderen
+Name[nn]=Trygg fjerning
+Name[pa]=ਸੁਰੱਖਿਅਤ ਹਟਾਓ
+Name[pl]=Usuń w sposób bezpieczny
+Name[pt]=Retirar com Segurança
+Name[pt_BR]=Remover de Modo Seguro
+Name[ro]=Scoate în siguranță
+Name[ru]=Безопасно извлечь
+Name[rw]=Gukuramo Neza
+Name[se]=Dorvvošlaš eretváldin
+Name[sk]=Bezpečne odpojiť
+Name[sl]=Varno odstrani
+Name[sr]=Безбедно уклони
+Name[sr@Latn]=Bezbedno ukloni
+Name[sv]=Säker urkoppling
+Name[ta]=பாதுகாப்பாக நீக்கு
+Name[te]=జాగరత్తగా తియి
+Name[tg]=Баровардани бехетар
+Name[th]=ถอดออกอย่างปลอดภัย
+Name[tr]=Güvenli Kaldır
+Name[tt]=İmin Çığaru
+Name[uk]=Безпечно вилучити
+Name[uz]=Эҳтиётлик билан узиш
+Name[vi]=Gỡ ra An toàn
+Name[wa]=Ositer e såvrité
+Name[zh_CN]=安全删除
+Name[zh_TW]=安全的移除
+Exec=kio_umountwrapper %u
+
+X-Ubuntu-Gettext-Domain=desktop_tdebase
diff --git a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
index 350e38237..d8ed7076a 100644
--- a/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
+++ b/redhat/applications/kio-umountwrapper/trinity-kio-umountwrapper.spec
@@ -1,12 +1,10 @@
 # Default version for this component
 %define kdecomp kio-umountwrapper
-%define version 0.2
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -18,8 +16,8 @@ BuildRequires: autoconf automake libtool m4
 
 Name:		trinity-%{kdecomp}
 Summary:	progress dialog for safely removing devices in Trinity.
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.2
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -32,6 +30,7 @@ Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
+Source1:	media_safelyremove.desktop
 
 
 BuildRequires: tqtinterface-devel
@@ -78,19 +77,45 @@ export PATH="%{_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+#%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+
 
 %clean
 %__rm -rf %{buildroot}
 
-
+%post
+for f in konqueror d3lphin; do
+  alternatives --install \
+    %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop \
+    media_safelyremove.desktop_${f} \
+    %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper \
+    20
+done
+
+  
+%postun
+if [ $1 -eq 0 ]; then
+  for f in konqueror d3lphin; do
+    alternatives --remove \
+      media_safelyremove.desktop_${f} \
+      %{_datadir}/apps/${f}/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+  done
+fi
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/kio_umountwrapper
-
+%{_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+#%{_datadir}/apps/dolphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
+%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper
 
 %Changelog
+* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-3
+- Add 'desktop' file, to make this program useful :-)
+
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.2-2
 - Rebuilt for Fedora 17
 - Removes post and postun