Browse Source

update *.desktop and add script for safe mode

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9987 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 8 years ago
parent
commit
13afb8680d

+ 2 - 2
f/firefox/firefox-safe-mode.desktop

@@ -7,10 +7,10 @@ GenericName=Web Browser
 GenericName[ja]=ウェブブラウザ
 Comment=Browse the Web (Safe Mode)
 Comment[ja]=ウェブの閲覧 (セーフモード)
-Exec=firefox -safe-mode %u
+Exec=firefox-safe-mode %u
 Icon=firefox
 Terminal=false
 Type=Application
 StartupWMClass=Firefox-bin
-X-Desktop-File-Install-Version=0.15
+X-Desktop-File-Install-Version=0.22
 Categories=Network;Application;

+ 3 - 0
f/firefox/firefox-safe-mode.vine.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec firefox -safe-mode "$@"

+ 11 - 1
f/firefox/firefox-vl.spec

@@ -22,7 +22,7 @@
 %define build_vine6 1
 %endif
 
-%define ffrelease 1%{?_dist_release}
+%define ffrelease 2%{?_dist_release}
 
 %define desktop_file_utils_version 0.6
 %define libjpeg_turbo_version 1.1.0
@@ -59,6 +59,7 @@ Source23:       fx-about.png
 Source24:       fx-about-wordmark.svg
 Source25:       firefox.desktop
 Source26:       firefox-safe-mode.desktop
+Source27:       firefox-safe-mode.vine.sh
 Source30:       firefox.1
 Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
@@ -330,6 +331,8 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
   $RPM_BUILD_ROOT%{_bindir}/firefox
 %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox
 
+%{__install} -p -m 755 %{SOURCE27} $RPM_BUILD_ROOT%{_bindir}/firefox-safe-mode
+
 %{__cat} %{SOURCE50} | sed -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \
   $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
 
@@ -339,6 +342,7 @@ XULRUNNER_DIR=`pkg-config --variable=libdir libxul | %{__sed} -e "s,%{_libdir},,
 #%{__chmod} 755 $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client
 %{__install} -p -D -m 664 %{SOURCE30} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
 
+
 %{__rm} -f $RPM_BUILD_ROOT%{ffdir}/firefox-config
 
 cd $RPM_BUILD_ROOT%{ffdir}/chrome
@@ -439,6 +443,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_bindir}/firefox
+%{_bindir}/firefox-safe-mode
 %{_mandir}/man1/*
 %{_datadir}/applications/vine-%{name}.desktop
 %{_datadir}/applications/vine-%{name}-safe-mode.desktop
@@ -449,6 +454,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sun Jan 24 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 43.0.4-2
+- update Source25 (firefox.desktop)
+- update Source26 (firefox-safe-mode.desktop)
+- add Source27 (firefox-safe-mode.vine.sh)
+
 * Sat Jan 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 43.0.4-1
 - new upstream release
 

+ 1 - 1
f/firefox/firefox.desktop

@@ -12,6 +12,6 @@ Icon=firefox
 Terminal=false
 Type=Application
 StartupWMClass=Firefox-bin
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;
 X-Desktop-File-Install-Version=0.15
 Categories=Network;Application;