From aeaaa13ab0bdb8db64fcd1bd7dc6d0db61da601c Mon Sep 17 00:00:00 2001 From: Automatic Build System Date: Fri, 5 Jan 2024 22:19:10 +0100 Subject: [PATCH] automatic version update by autodist [release 48.0.1-1mamba;Tue Aug 23 2016] --- firefox-48.0.1-install_dir.patch | 12 +++ firefox.spec | 124 ++++++++++++++++--------------- 2 files changed, 78 insertions(+), 58 deletions(-) create mode 100644 firefox-48.0.1-install_dir.patch diff --git a/firefox-48.0.1-install_dir.patch b/firefox-48.0.1-install_dir.patch new file mode 100644 index 0000000..51fe4ba --- /dev/null +++ b/firefox-48.0.1-install_dir.patch @@ -0,0 +1,12 @@ +diff -up firefox-29.0/mozilla-release/config/baseconfig.mk.orig firefox-29.0/mozilla-release/config/baseconfig.mk +--- mozilla-release/config/baseconfig.mk.orig 2014-04-22 15:38:52.948165295 +0200 ++++ mozilla-release/config/baseconfig.mk 2014-04-22 15:42:20.387481673 +0200 +@@ -4,7 +4,7 @@ + # whether a normal build is happening or whether the check is running. + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + ifndef TOP_DIST + TOP_DIST = dist diff --git a/firefox.spec b/firefox.spec index 84ee9dd..791655c 100644 --- a/firefox.spec +++ b/firefox.spec @@ -7,7 +7,7 @@ %define majversion %(echo %version | cut -d. -f 1-2) %define xulrunner_ver %(echo %version | cut -d. -f 1) %define firefox_internal_version %(echo %version | cut -d. -f1) -%define firefoxappdir %{_libdir}/firefox-%{firefox_internal_version} +%define firefoxappdir %{_libdir}/firefox %define firefoxsdkdir %{_libdir}/firefox-devel-%{firefox_internal_version} %define firefoxincludedir %{_includedir}/firefox-%{version} #%define mozilla_version central @@ -15,7 +15,7 @@ #% define source_dir mozilla-%{mozilla_version} Name: firefox -Version: 47.0.1 +Version: 48.0.1 Release: 1mamba Epoch: 1 Summary: The next generation browsing technology from mozilla.org @@ -47,7 +47,8 @@ Patch7: firefox-36.0.3-fix-build-upstream.patch Patch8: firefox-39.0-openmamba-prefs.patch Patch9: firefox-42.0-build-add-freetype-system-wrapper.patch Patch10: firefox-43.0.4-fix-missing-PR_snprint.patch -Patch11: firefox-47.0-gcc-6.1.0.patch +Patch11: firefox-47.0-gcc-6.1.0.patch +Patch12: firefox-48.0.1-install_dir.patch License: GPL, LGPL, MPL 1.1 ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -154,7 +155,8 @@ sed -e 's|__RPM_VERSION_INTERNAL__|%{firefox_internal_version}|' %{PATCH0} | pat %patch8 -p1 #%patch9 -p1 #%patch10 -p1 -%patch11 -p1 +#%patch11 -p1 +%patch12 -p1 #% define _use_internal_dependency_generator 0 #% define __find_provides %{_builddir}/firefox-%{version}/%{source_dir}/find_provides.sh # @@ -188,26 +190,17 @@ export MOZ_PHOENIX="1" export BUILD_OFFICIAL="1" export MOZILLA_OFFICIAL="1" ../configure \ - --build=%{_build} \ --host=%{_host} \ --target=%{_target_platform} \ --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ --disable-elf-hack \ --enable-system-cairo \ - --with-system-libxul \ --with-system-jpeg \ --with-system-zlib \ --with-system-png \ - --with-system-mng \ --with-system-nspr \ --with-system-nss \ --with-x \ - --enable-canvas \ - --enable-svg \ - --enable-svg-renderer=cairo \ --with-pthreads \ --with-java-bin-path=%{_bindir} \ --enable-default-toolkit=cairo-gtk3 \ @@ -215,43 +208,54 @@ export MOZILLA_OFFICIAL="1" --enable-ldap \ --enable-application=browser \ --disable-calendar \ - --disable-composer \ - --disable-mailnews \ - --with-embedding-profile=default \ --with-default-mozilla-five-home=%{firefoxappdir} \ --with-user-appdir=.firefox \ --with-distribution-id="%{distroname}" \ - --disable-freetype2 \ - --disable-xprint \ - --enable-pango \ - --enable-crypto \ - --enable-single-profile \ - --disable-profilesharing \ --enable-accessibility \ - --enable-xinerama \ - --enable-xft \ --enable-extensions=default \ - --disable-installer \ - --enable-reorder \ --enable-optimize \ --disable-debug \ --disable-tests \ --disable-strip \ - --disable-pedantic \ - --enable-jsd \ --enable-necko-protocols=all \ %if %{testing} --enable-image-decoders=all \ --enable-image-encoders=all \ %endif - --enable-storage \ --disable-necko-wifi \ --enable-official-branding \ --enable-startup-notification \ --enable-chrome-format=omni \ - --enable-libnotify \ - --enable-gio \ - --disable-gnomevfs + --enable-gio + +# Removed since 48.0: +# --build=%{_build} \ +# --bindir=%{_bindir} \ +# --libdir=%{_libdir} \ +# --mandir=%{_mandir} \ +# --with-system-libxul \ +# --with-system-mng \ +# --enable-canvas \ +# --enable-svg \ +# --enable-svg-renderer=cairo \ +# --disable-composer \ +# --disable-mailnews \ +# --with-embedding-profile=default \ +# --disable-freetype2 \ +# --disable-xprint \ +# --enable-pango \ +# --enable-crypto \ +# --enable-single-profile \ +# --disable-profilesharing \ +# --enable-xinerama \ +# --enable-xft \ +# --disable-installer \ +# --enable-reorder \ +# --disable-pedantic \ +# --enable-jsd \ +# --enable-storage \ +# --enable-libnotify \ +# --disable-gnomevfs # --disable-logging \ # --with-system-mozldap \ --program-suffix=4 @@ -300,7 +304,7 @@ cat > dist/bin/browser/defaults/preferences/firefox-l10n.js << _EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); _EOF -%makeinstall +%makeinstall libdir=%{_libdir} mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --vendor mozilla --dir %{buildroot}%{_datadir}/applications %{SOURCE2} @@ -369,7 +373,7 @@ includedir=%{firefoxincludedir} Name: Mozilla Plug-In API Description: Mozilla Plug-In API -Version: 47.0.1 +Version: 48.0.1 Cflags: -I\${includedir} -DXP_UNIX _EOF @@ -452,10 +456,10 @@ fi #%dir %{firefoxappdir}/browser/searchplugins #%{firefoxappdir}/browser/searchplugins/* %{firefoxappdir}/firefox-bin -%{firefoxappdir}/webapprt-stub -%dir %{firefoxappdir}/webapprt -%{firefoxappdir}/webapprt/omni.ja -%{firefoxappdir}/webapprt/webapprt.ini +#%{firefoxappdir}/webapprt-stub +#%dir %{firefoxappdir}/webapprt +#%{firefoxappdir}/webapprt/omni.ja +#%{firefoxappdir}/webapprt/webapprt.ini #%dir %{firefoxappdir}/modules #%dir %{firefoxappdir}/modules/services-aitc #%{firefoxappdir}/modules/services-aitc/.mkdir.done @@ -474,27 +478,28 @@ fi #%{_libdir}/firefox-*/chrome.manifest #%dir %{_libdir}/firefox-*/components #%{_libdir}/firefox-*/components/* -%{_libdir}/firefox-*/crashreporter -%{_libdir}/firefox-*/defaults/pref/channel-prefs.js -%{_libdir}/firefox-*/dependentlibs.list -%dir %{_libdir}/firefox-*/dictionaries -%{_libdir}/firefox-*/dictionaries/* -%dir %{_libdir}/firefox-*/gmp-clearkey -%dir %{_libdir}/firefox-*/gmp-clearkey/0.1 -%{_libdir}/firefox-*/gmp-clearkey/0.1/* -%{_libdir}/firefox-*/Throbber-small.gif -%{_libdir}/firefox-*/icons/updater.png +%{firefoxappdir}/crashreporter +%{firefoxappdir}/defaults/pref/channel-prefs.js +%{firefoxappdir}/dependentlibs.list +%dir %{firefoxappdir}/dictionaries +%{firefoxappdir}/dictionaries/* +%dir %{firefoxappdir}/gmp-clearkey +%dir %{firefoxappdir}/gmp-clearkey/0.1 +%{firefoxappdir}/gmp-clearkey/0.1/* +%{firefoxappdir}/Throbber-small.gif +%{firefoxappdir}/icons/updater.png +%{firefoxappdir}/icudt56l.dat #%{_libdir}/firefox-*/libmozalloc.so -%{_libdir}/firefox-*/gtk2/libmozgtk.so -%{_libdir}/firefox-*/liblgpllibs.so -%{_libdir}/firefox-*/libmozavcodec.so -%{_libdir}/firefox-*/libmozavutil.so -%{_libdir}/firefox-*/libmozgtk.so -%{_libdir}/firefox-*/libmozsqlite3.so -%{_libdir}/firefox-*/libxul.so -%{_libdir}/firefox-*/omni.ja -%{_libdir}/firefox-*/plugin-container -%{_libdir}/firefox-*/updater +%{firefoxappdir}/gtk2/libmozgtk.so +%{firefoxappdir}/liblgpllibs.so +%{firefoxappdir}/libmozavcodec.so +%{firefoxappdir}/libmozavutil.so +%{firefoxappdir}/libmozgtk.so +%{firefoxappdir}/libmozsqlite3.so +%{firefoxappdir}/libxul.so +%{firefoxappdir}/omni.ja +%{firefoxappdir}/plugin-container +%{firefoxappdir}/updater %dir %{_datadir}/idl/firefox-* %{_datadir}/idl/firefox-*/* @@ -1755,6 +1760,9 @@ Zulu language support for Firefox. #%{firefoxappdir}/browser/extensions/langpack-zu@firefox.mozilla.org/ %changelog +* Tue Aug 23 2016 Automatic Build System 48.0.1-1mamba +- automatic version update by autodist + * Tue Jun 28 2016 Automatic Build System 47.0.1-1mamba - automatic version update by autodist