diff --git a/firefox.spec b/firefox.spec index b72f019..e721a09 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,7 +7,7 @@ # This also means only STABLE upstream releases, NO betas. # This is a discussed topic. Please, do not flame it again. -%define major 17.0.1 +%define major 18.0.2 %define ff_epoch 0 # (tpg) set version HERE !!! %define realver %{major} @@ -17,12 +17,12 @@ %define mozillalibdir %{_libdir}/%{name}-%{major} %define pluginsdir %{_libdir}/mozilla/plugins -# libxul.so is provided by libxulrunnner2.0. -%if %{_use_internal_dependency_generator} -%define __noautoreq 'libxul.so' -%else -%define _requires_exceptions libxul.so -%endif +## libxul.so is provided by libxulrunnner2.0. +#if %{_use_internal_dependency_generator} +#define __noautoreq 'libxul.so' +#else +#define _requires_exceptions libxul.so +#endif # this seems fragile, so require the exact version or later (#58754) %define sqlite3_version %(pkg-config --modversion sqlite3 &>/dev/null && pkg-config --modversion sqlite3 2>/dev/null || echo 0) @@ -69,10 +69,12 @@ Patch8: firefox-17.0-disable-check-default-browser.patch Patch9: firefox-5.0-asciidel.patch Patch10: firefox-3.5.3-default-mail-handler.patch # Patches for kde integration of FF -Patch11: firefox-17.0-kde.patch -Patch12: mozilla-17.0-kde.patch +Patch11: firefox-18.0-kde.patch +Patch12: mozilla-18.0-kde.patch Patch13: firefox-13-fix-nspr-include.patch -Patch14: firefox-13-fix-cairo-build.patch +Patch14: firefox-18-fix-cairo-build.patch +Patch17: xulrunner-15.0-gcc47.patch +Patch19: rhbz-304121.patch Patch34: xulrunner_nojit.patch # (cjw) use system virtualenv Patch36: firefox-17.0-virtualenv.patch @@ -87,9 +89,9 @@ BuildRequires: zlib-devel BuildRequires: glib2-devel BuildRequires: libIDL2-devel BuildRequires: makedepend -BuildRequires: nss-devel >= 2:3.12.10 +BuildRequires: nss-devel >= 2:3.14.1 BuildRequires: nss-static-devel -BuildRequires: nspr-devel >= 2:4.8.9 +BuildRequires: nspr-devel >= 2:4.9.4 BuildRequires: startup-notification-devel BuildRequires: dbus-glib-devel BuildRequires: python @@ -181,6 +183,8 @@ Files and macros mainly for building Firefox extensions. %patch9 -p1 -b .ascii %patch10 -p1 -b .default-mail-handler %patch14 -p1 +%patch17 -p2 -b .gcc47 +%patch19 -p2 -b .rhbz-304121 ## KDE INTEGRATION # Disable kde integration , need refactoring @@ -372,6 +376,9 @@ cat <%{buildroot}%{_sys_macros_dir}/%{name}.macros %%firefox_extdir %%(if [ "%%_target_cpu" = "noarch" ]; then echo %%{_datadir}/mozilla/extensions/%%{firefox_appid}; else echo %%{_libdir}/mozilla/extensions/%%{firefox_appid}; fi) FIN +# Fix libxpcom.so rights +chmod 755 $RPM_BUILD_ROOT/%{mozillalibdir}/libxpcom.so + %pre if [ -d %{mozillalibdir}/dictionaries ]; then rm -fr %{mozillalibdir}/dictionaries @@ -398,6 +405,7 @@ fi %{_libdir}/%{name}-%{major}* #% ghost %{mozillalibdir}/defaults/profile/bookmarks.html %dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/extensions %dir %{pluginsdir} %dir %{_libdir}/mozilla/extensions/%{firefox_appid} %dir %{_datadir}/mozilla/extensions/%{firefox_appid}