rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-3

Browse Source 
- reverted the desktop file name for Fedora15 & 16
This commit is contained in:
Martin Stransky 2011-10-24 16:31:34 +02:00
parent d7e5f11b81
commit 26608097b0
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firefox.spec
View File

@ -44,7 +44,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 7.0.1 Version: 7.0.1
Release: 2%{?pre_tag}%{?dist} Release: 3%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -206,9 +206,11 @@ DESTDIR=$RPM_BUILD_ROOT make install
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
desktop-file-install \ %if 0%{?fedora} <= 16
--dir $RPM_BUILD_ROOT%{_datadir}/applications \ desktop-file-install --vendor mozilla --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
%{SOURCE20} %else
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE20}
%endif
# set up the firefox start script # set up the firefox start script
%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox %{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/firefox
@ -300,7 +302,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%dir %{_datadir}/mozilla/extensions/%{firefox_app_id} %dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
%dir %{_libdir}/mozilla/extensions/%{firefox_app_id} %dir %{_libdir}/mozilla/extensions/%{firefox_app_id}
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/*.desktop
%dir %{mozappdir} %dir %{mozappdir}
%doc %{mozappdir}/LICENSE %doc %{mozappdir}/LICENSE
%doc %{mozappdir}/README.txt %doc %{mozappdir}/README.txt
@ -340,6 +342,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-3
- reverted the desktop file name for Fedora15 & 16
* Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-2 * Mon Oct 24 2011 Martin Stransky <stransky@redhat.com> - 7.0.1-2
- renamed mozilla-firefox.desktop to firefox.desktop (#736558) - renamed mozilla-firefox.desktop to firefox.desktop (#736558)
- nspluginwrapper is not run in plugin-container (#747981) - nspluginwrapper is not run in plugin-container (#747981)