rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing 1003691 - pretrans failed when composing new fedora

Browse Source
This commit is contained in:
Jan Horak 2013-09-03 18:14:55 +02:00
parent 88a49ac21d
commit cb2318058d
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
firefox.spec
View File

@ -58,7 +58,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 23.0.1 Version: 23.0.1
Release: 3%{?pre_tag}%{?dist} Release: 4%{?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
@ -347,18 +347,25 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" $RPM_BUILD_ROOT/%{
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%pretrans
# Moves defaults/preferences to browser/defaults/preferences in Fedora 19+ # Moves defaults/preferences to browser/defaults/preferences in Fedora 19+
%pretrans -p <lua>
%if 0%{?fedora} >= 19 %if 0%{?fedora} >= 19
if [ -L %{mozappdir}/browser/defaults/preferences ]; then require 'posix'
rm %{mozappdir}/browser/defaults/preferences require 'os'
mkdir -p %{mozappdir}/browser/defaults/preferences if (posix.stat("%{mozappdir}/browser/defaults/preferences", "type") == "link") then
if [ -d %{mozappdir}/defaults/preferences ]; then posix.unlink("%{mozappdir}/browser/defaults/preferences")
mv %{mozappdir}/defaults/preferences/* %{mozappdir}/browser/defaults/preferences posix.mkdir("%{mozappdir}/browser/defaults/preferences")
rm -f %{mozappdir}/defaults/preferences/* if (posix.stat("%{mozappdir}/defaults/preferences", "type") == "directory") then
echo "Content of this directory has been moved to %{mozappdir}/browser/defaults/preferences." > %{mozappdir}/defaults/preferences/README for i,filename in pairs(posix.dir("%{mozappdir}/defaults/preferences")) do
fi os.rename("%{mozappdir}/defaults/preferences/"..filename, "%{mozappdir}/browser/defaults/preferences/"..filename)
fi end
f = io.open("%{mozappdir}/defaults/preferences/README","w")
if f then
f:write("Content of this directory has been moved to %{mozappdir}/browser/defaults/preferences.")
f:close()
end
end
end
%endif %endif
%preun %preun
@ -436,6 +443,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Sep 3 2013 Jan Horak <jhorak@redhat.com> - 23.0.1-4
- Fixing rhbz#1003691
* Fri Aug 30 2013 Martin Stransky <stransky@redhat.com> - 23.0.1-3 * Fri Aug 30 2013 Martin Stransky <stransky@redhat.com> - 23.0.1-3
- Spec tweak (rhbz#991493) - Spec tweak (rhbz#991493)