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

- Icon tweaks and minor spec-file variable cleanup: s/ffdir/mozappdir/g

This commit is contained in:
Christopher Aillon 2006-09-07 04:19:44 +00:00
parent 3245da27ee
commit 1fb0c4e32e
1 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
firefox.spec
View File

@ -11,7 +11,7 @@
Summary: Mozilla Firefox Web browser. Summary: Mozilla Firefox Web browser.
Name: firefox Name: firefox
Version: 1.5.0.6 Version: 1.5.0.6
Release: 11 Release: 12
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL License: MPL/LGPL
Group: Applications/Internet Group: Applications/Internet
@ -29,8 +29,7 @@ Source13: firefox-redhat-default-prefs.js
Source20: firefox.desktop Source20: firefox.desktop
Source21: firefox.sh.in Source21: firefox.sh.in
Source22: firefox.png Source22: firefox.png
Source23: firefox.xpm Source23: firefox.1
Source24: firefox.1
Source50: firefox-xremote-client.sh.in Source50: firefox-xremote-client.sh.in
Source100: find-external-requires Source100: find-external-requires
@ -86,7 +85,7 @@ Requires: nss >= %{nss_version}
Requires: desktop-file-utils >= %{desktop_file_utils_version} Requires: desktop-file-utils >= %{desktop_file_utils_version}
Obsoletes: phoenix, mozilla-firebird, MozillaFirebird Obsoletes: phoenix, mozilla-firebird, MozillaFirebird
Provides: webclient Provides: webclient
%define ffdir %{_libdir}/firefox-%{version} %define mozappdir %{_libdir}/firefox-%{version}
%if ! %{build_devel_package} %if ! %{build_devel_package}
AutoProv: 0 AutoProv: 0
@ -161,7 +160,9 @@ export LIBDIR='%{_libdir}'
%define moz_make_flags %{?_smp_mflags} %define moz_make_flags %{?_smp_mflags}
%endif %endif
LDFLAGS="-Wl,-rpath,%{ffdir}" MAKE="gmake %{moz_make_flags}" make -f client.mk build export LDFLAGS="-Wl,-rpath,%{mozappdir}"
export MAKE="gmake %{moz_make_flags}"
make -f client.mk build
#--------------------------------------------------------------------- #---------------------------------------------------------------------
@ -175,7 +176,7 @@ cd -
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz %{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz
%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{ffdir} %{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{mozappdir}
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar
@ -195,43 +196,45 @@ desktop-file-install --vendor mozilla \
# set up our default preferences # set up our default preferences
%{__cat} %{SOURCE13} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs %{__cat} %{SOURCE13} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs
%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{ffdir}/greprefs/all-redhat.js %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
%{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{ffdir}/defaults/pref/all-redhat.js %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
%{__rm} rh-default-prefs %{__rm} rh-default-prefs
# set up our default bookmarks # set up our default bookmarks
%{__install} -p -D %{SOURCE12} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html %{__install} -p -D %{SOURCE12} $RPM_BUILD_ROOT%{mozappdir}/defaults/profile/bookmarks.html
%{__cat} %{SOURCE50} | %{__sed} -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \ %{__cat} %{SOURCE50} | %{__sed} -e 's,FFDIR,%{mozappdir},g' -e 's,LIBDIR,%{_libdir},g' > \
$RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client $RPM_BUILD_ROOT%{mozappdir}/firefox-xremote-client
%{__chmod} 755 $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client %{__chmod} 755 $RPM_BUILD_ROOT%{mozappdir}/firefox-xremote-client
%{__install} -p -D %{SOURCE24} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1 %{__install} -p -D %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
%{__rm} -f $RPM_BUILD_ROOT%{ffdir}/firefox-config %{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/firefox-config
cd $RPM_BUILD_ROOT%{ffdir}/chrome cd $RPM_BUILD_ROOT%{mozappdir}/chrome
find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \; find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
cd - cd -
%{__cat} > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF %{__cat} > $RPM_BUILD_ROOT%{mozappdir}/defaults/pref/firefox-l10n.js << EOF
pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.locale", "chrome://global/locale/intl.properties");
EOF EOF
%{__chmod} 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js %{__chmod} 644 $RPM_BUILD_ROOT%{mozappdir}/defaults/pref/firefox-l10n.js
%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/ %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
%{__cp} %{SOURCE23} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/default.xpm %{__cp} other-licenses/branding/%{name}/default.xpm \
%{__cp} %{SOURCE23} $RPM_BUILD_ROOT%{ffdir}/icons/default.xpm $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
%{__cp} other-licenses/branding/%{name}/default.xpm \
$RPM_BUILD_ROOT%{mozappdir}/icons/
# own mozilla plugin dir (#135050) # own mozilla plugin dir (#135050)
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
# Install langpacks # Install langpacks
%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/extensions %{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
%{__tar} xjf %{SOURCE2} %{__tar} xjf %{SOURCE2}
for langpack in `ls firefox-langpacks/*.xpi`; do for langpack in `ls firefox-langpacks/*.xpi`; do
language=`basename $langpack .xpi` language=`basename $langpack .xpi`
extensiondir=$RPM_BUILD_ROOT%{ffdir}/extensions/langpack-$language@firefox.mozilla.org extensiondir=$RPM_BUILD_ROOT%{mozappdir}/extensions/langpack-$language@firefox.mozilla.org
%{__mkdir_p} $extensiondir %{__mkdir_p} $extensiondir
unzip $langpack -d $extensiondir unzip $langpack -d $extensiondir
find $extensiondir -type f | xargs chmod 644 find $extensiondir -type f | xargs chmod 644
@ -263,14 +266,14 @@ install -c -m 755 dist/bin/xpcshell \
dist/bin/xpidl \ dist/bin/xpidl \
dist/bin/xpt_dump \ dist/bin/xpt_dump \
dist/bin/xpt_link \ dist/bin/xpt_link \
$RPM_BUILD_ROOT/%{ffdir} $RPM_BUILD_ROOT/%{mozappdir}
install -c -m 644 build/unix/*.pc \ install -c -m 644 build/unix/*.pc \
$RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
%endif %endif
# ghost files # ghost files
touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
#--------------------------------------------------------------------- #---------------------------------------------------------------------
@ -288,8 +291,8 @@ update-desktop-database %{_datadir}/applications
%preun %preun
# is it a final removal? # is it a final removal?
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
%{__rm} -rf %{ffdir}/components %{__rm} -rf %{mozappdir}/components
%{__rm} -rf %{ffdir}/extensions %{__rm} -rf %{mozappdir}/extensions
fi fi
%files %files
@ -300,46 +303,46 @@ fi
%{_datadir}/pixmaps/firefox.png %{_datadir}/pixmaps/firefox.png
%{_libdir}/mozilla %{_libdir}/mozilla
%dir %{ffdir} %dir %{mozappdir}
%{ffdir}/LICENSE %{mozappdir}/LICENSE
%{ffdir}/README.txt %{mozappdir}/README.txt
%{ffdir}/*.properties %{mozappdir}/*.properties
%{ffdir}/chrome %{mozappdir}/chrome
%dir %{ffdir}/components %dir %{mozappdir}/components
%ghost %{ffdir}/components/compreg.dat %ghost %{mozappdir}/components/compreg.dat
%ghost %{ffdir}/components/xpti.dat %ghost %{mozappdir}/components/xpti.dat
%{ffdir}/components/*.so %{mozappdir}/components/*.so
%{ffdir}/components/*.xpt %{mozappdir}/components/*.xpt
%{ffdir}/components/*.js %{mozappdir}/components/*.js
%{ffdir}/defaults %{mozappdir}/defaults
%{ffdir}/extensions %{mozappdir}/extensions
%{ffdir}/greprefs %{mozappdir}/greprefs
%{ffdir}/icons %{mozappdir}/icons
%{ffdir}/init.d %{mozappdir}/init.d
%{ffdir}/plugins %{mozappdir}/plugins
%{ffdir}/res %{mozappdir}/res
%{ffdir}/searchplugins %{mozappdir}/searchplugins
%{ffdir}/*.so %{mozappdir}/*.so
%{ffdir}/firefox %{mozappdir}/firefox
%{ffdir}/firefox-bin %{mozappdir}/firefox-bin
%{ffdir}/firefox-xremote-client %{mozappdir}/firefox-xremote-client
%{ffdir}/mozilla-xremote-client %{mozappdir}/mozilla-xremote-client
%{ffdir}/run-mozilla.sh %{mozappdir}/run-mozilla.sh
# XXX See if these are needed still # XXX See if these are needed still
%{ffdir}/dependentlibs.list %{mozappdir}/dependentlibs.list
%{ffdir}/updater* %{mozappdir}/updater*
%{ffdir}/removed-files %{mozappdir}/removed-files
%if %{build_devel_package} %if %{build_devel_package}
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/idl/firefox-%{version} %{_datadir}/idl/firefox-%{version}
%{_includedir}/firefox-%{version} %{_includedir}/firefox-%{version}
%{ffdir}/xpcshell %{mozappdir}/xpcshell
%{ffdir}/xpicleanup %{mozappdir}/xpicleanup
%{ffdir}/xpidl %{mozappdir}/xpidl
%{ffdir}/xpt_dump %{mozappdir}/xpt_dump
%{ffdir}/xpt_link %{mozappdir}/xpt_link
%{_libdir}/pkgconfig/firefox-xpcom.pc %{_libdir}/pkgconfig/firefox-xpcom.pc
%{_libdir}/pkgconfig/firefox-plugin.pc %{_libdir}/pkgconfig/firefox-plugin.pc
%{_libdir}/pkgconfig/firefox-js.pc %{_libdir}/pkgconfig/firefox-js.pc
@ -351,6 +354,9 @@ fi
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Sep 7 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.6-12
- Icon tweaks and minor spec-file variable cleanup: s/ffdir/mozappdir/g
* Wed Sep 6 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.6-11 * Wed Sep 6 2006 Christopher Aillon <caillon@redhat.com> 1.5.0.6-11
- Fix for cursor position in editor widgets by tagoh and behdad (#198759) - Fix for cursor position in editor widgets by tagoh and behdad (#198759)