#
# Conditional build:
%bcond_with tests # enable tests (whatever they check)
-%bcond_with gtk3 # GTK+ 3.x instead of 2.x
+%bcond_without gtk3 # GTK+ 3.x instead of 2.x
%bcond_without kerberos # disable krb5 support
%bcond_without official # official Firefox branding
%bcond_with pgo # PGO-enabled build (requires working $DISPLAY == :100)
# - disabled shared_js - https://bugzilla.mozilla.org/show_bug.cgi?id=1039964
%bcond_with shared_js # shared libmozjs library [broken]
+%bcond_without system_icu # build without system ICU
# On updating version, grab CVE links from:
# https://www.mozilla.org/security/known-vulnerabilities/firefox.html
# The actual sqlite version (see RHBZ#480989):
%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
-%define nspr_ver 4.12
-%define nss_ver 3.21.1
+%define nspr_ver 4.14
+%define nss_ver 3.30.2
Summary: Firefox web browser
Summary(hu.UTF-8): Firefox web böngésző
Summary(pl.UTF-8): Firefox - przeglądarka WWW
Name: firefox
-Version: 46.0
+Version: 55.0.2
Release: 1
License: MPL v2.0
Group: X11/Applications/Networking
Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
-# Source0-md5: 8a516da3858b17f55451810efc7a239a
+# Source0-md5: d1e65708db51034d2ad090b4bfba7f1c
Source3: %{name}.desktop
Source4: %{name}.sh
Source5: vendor.js
Source6: vendor-ac.js
-Patch1: idl-parser.patch
-Patch2: xulrunner-new-libxul.patch
-Patch3: xulrunner-paths.patch
-Patch4: xulrunner-pc.patch
-Patch5: install-pc-files.patch
-Patch6: %{name}-prefs.patch
-Patch7: %{name}-pld-bookmarks.patch
-Patch8: %{name}-no-subshell.patch
-Patch9: %{name}-middle_click_paste.patch
-Patch11: %{name}-system-virtualenv.patch
-Patch12: %{name}-Disable-Firefox-Health-Report.patch
-Patch14: freetype.patch
+Patch0: idl-parser.patch
+Patch2: xulrunner-paths.patch
+Patch4: %{name}-prefs.patch
+Patch5: %{name}-pld-bookmarks.patch
+Patch6: %{name}-no-subshell.patch
+Patch7: %{name}-middle_click_paste.patch
+Patch8: %{name}-system-virtualenv.patch
+Patch9: %{name}-Disable-Firefox-Health-Report.patch
+Patch10: freetype.patch
URL: https://www.mozilla.org/firefox/
BuildRequires: OpenGL-devel
BuildRequires: alsa-lib-devel
BuildRequires: automake
+BuildRequires: autoconf2_13
BuildRequires: bzip2-devel
BuildRequires: cairo-devel >= 1.10.2-5
+BuildRequires: cargo
BuildRequires: dbus-glib-devel >= 0.60
+BuildRequires: fontconfig-devel >= 1:2.7.0
BuildRequires: freetype-devel >= 1:2.1.8
BuildRequires: gcc-c++ >= 6:4.4
BuildRequires: glib2-devel >= 1:2.22
%{!?with_gtk3:BuildRequires: gtk+2-devel >= 2:2.18.0}
%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.4.0}
%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
-BuildRequires: hunspell-devel >= 1.2.3
+BuildRequires: hunspell-devel >= 1.6.1
BuildRequires: libIDL-devel >= 0.8.0
# DECnet (dnprogs.spec), not dummy net (libdnet.spec)
#BuildRequires: libdnet-devel
BuildRequires: libevent-devel >= 1.4.7
# standalone libffi 3.0.9 or gcc's from 4.5(?)+
BuildRequires: libffi-devel >= 6:3.0.9
-BuildRequires: libicu-devel >= 50.1
+%{?with_system_icu:BuildRequires: libicu-devel >= 58.1}
# requires libjpeg-turbo implementing at least libjpeg 6b API
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 2:1.6.19
+BuildRequires: libpng-devel >= 2:1.6.28
BuildRequires: libstdc++-devel >= 6:4.4
-BuildRequires: libvpx-devel >= 1.3.0
+BuildRequires: libvpx-devel >= 1.5.0
BuildRequires: nspr-devel >= 1:%{nspr_ver}
BuildRequires: nss-devel >= 1:%{nss_ver}
BuildRequires: pango-devel >= 1:1.22.0
BuildRequires: readline-devel
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: rust
BuildRequires: sed >= 4.0
-BuildRequires: sqlite3-devel >= 3.9.1
+BuildRequires: sqlite3-devel >= 3.17.0
BuildRequires: startup-notification-devel >= 0.8
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXScrnSaver-devel
BuildConflicts: %{name}-devel < %{version}
Requires(post): mktemp >= 1.5-18
Requires: browser-plugins >= 2.0
+Requires: cairo >= 1.10.2-5
+Requires: dbus-glib >= 0.60
Requires: desktop-file-utils
+Requires: fontconfig-libs >= 1:2.7.0
+Requires: glib2 >= 1:2.22
+%{!?with_gtk3:Requires: gtk+2 >= 2:2.18.0}
+%{?with_gtk3:Requires: gtk+3 >= 3.4.0}
Requires: hicolor-icon-theme
+Requires: libjpeg-turbo
+Requires: libpng >= 2:1.6.28
+Requires: libpng(APNG) >= 0.10
+Requires: libvpx >= 1.5.0
Requires: myspell-common
Requires: nspr >= 1:%{nspr_ver}
Requires: nss >= 1:%{nss_ver}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: pango >= 1:1.22.0
+Requires: sqlite3 >= %{sqlite_build_version}
+Requires: startup-notification >= 0.8
+Provides: xulrunner-libs = 2:%{version}-%{release}
Provides: wwwbrowser
+Obsoletes: firefox-devel
+Obsoletes: firefox-libs
Obsoletes: iceweasel
+Obsoletes: iceweasel-libs
Obsoletes: mozilla-firebird
Obsoletes: mozilla-firefox
Obsoletes: mozilla-firefox-lang-en < 2.0.0.8-3
Obsoletes: mozilla-firefox-libs
Obsoletes: xulrunner
Obsoletes: xulrunner-gnome
+Obsoletes: xulrunner-libs
Conflicts: firefox-lang-resources < %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoprovfiles %{_libdir}/%{name}
# and as we don't provide them, don't require either
-%define _noautoreq libmozjs.so libxul.so
+%define _noautoreq liblgpllibs.so libmozavcodec.so libmozavutil.so libmozgtk.so libmozjs.so libmozsandbox.so libxul.so
%description
Firefox is an open-source web browser, designed for standards
ruchu otwartego oprogramowania oraz tworzoną z myślą o zgodności ze
standardami, wydajnością i przenośnością.
-%package libs
-Summary: Firefox shared libraries
-Summary(pl.UTF-8): Biblioteki współdzielone Firefoxa
-Group: X11/Libraries
-Requires: cairo >= 1.10.2-5
-Requires: dbus-glib >= 0.60
-Requires: glib2 >= 1:2.22
-%{!?with_gtk3:Requires: gtk+2 >= 2:2.18.0}
-%{?with_gtk3:Requires: gtk+3 >= 3.4.0}
-Requires: libjpeg-turbo
-Requires: libpng >= 2:1.6.19
-Requires: libpng(APNG) >= 0.10
-Requires: libvpx >= 1.3.0
-Requires: pango >= 1:1.22.0
-Requires: sqlite3 >= %{sqlite_build_version}
-Requires: startup-notification >= 0.8
-Provides: xulrunner-libs = 2:%{version}-%{release}
-Obsoletes: iceweasel-libs
-Obsoletes: xulrunner-libs
+%package -n gmp-api
+Summary: GeckoMediaPlugins API header files
+Summary(pl.UTF-8): Pliki nagłówkowe API GeckoMediaPlugins
+Group: Development/Libraries
+URL: https://wiki.mozilla.org/GeckoMediaPlugins
+# actually C++ compiler; STL is not even used
+Requires: libstdc++-devel
+
+%description -n gmp-api
+GeckoMediaPlugins API header files.
-%description libs
-XULRunner shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone XULRunnera.
-
-%package devel
-Summary: Headers for developing programs that will use Firefox
-Summary(pl.UTF-8): Pliki nagłówkowe do tworzenia programów używających Firefox
-Group: X11/Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: nspr-devel >= 1:%{nspr_ver}
-Requires: nss-devel >= 1:%{nss_ver}
-Requires: python-ply
-Provides: xulrunner-devel = 2:%{version}-%{release}
-Obsoletes: iceweasel-devel
-Obsoletes: mozilla-devel
-Obsoletes: mozilla-firefox-devel
-Obsoletes: seamonkey-devel
-Obsoletes: xulrunner-devel
-
-%description devel
-Firefox development package.
-
-%description devel -l pl.UTF-8
-Pakiet programistyczny Firefoxa.
+%description -n gmp-api -l pl.UTF-8
+Pliki nagłówkowe API GeckoMediaPlugins.
%prep
%setup -q
# hunspell needed for factory including mozHunspell.h
echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Makefile.in
-%patch1 -p2
-%patch2 -p1
-%patch3 -p2
+%patch0 -p2
+%patch2 -p2
%patch4 -p1
-%patch5 -p2
-%patch6 -p1
+%patch5 -p1
+%patch6 -p2
%patch7 -p1
%patch8 -p2
%patch9 -p1
-%patch11 -p2
-%patch12 -p1
-%patch14 -p2
-
-cp -a xulrunner/installer/*.pc.in browser/installer/
+%patch10 -p2
%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' xpcom/typelib/xpt/tools/xpt.py xpcom/idl-parser/xpidl/xpidl.py
cat << 'EOF' > .mozconfig
. $topsrcdir/browser/config/mozconfig
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64"
+export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64"
+
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
# Options for 'configure' (same as command-line options).
-ac_add_options --build=%{_target_platform}
ac_add_options --host=%{_target_platform}
ac_add_options --prefix=%{_prefix}
-ac_add_options --exec-prefix=%{_exec_prefix}
-ac_add_options --bindir=%{_bindir}
-ac_add_options --sbindir=%{_sbindir}
-ac_add_options --sysconfdir=%{_sysconfdir}
-ac_add_options --datadir=%{_datadir}
-ac_add_options --includedir=%{_includedir}
-ac_add_options --libdir=%{_libdir}
-ac_add_options --libexecdir=%{_libexecdir}
-ac_add_options --localstatedir=%{_localstatedir}
-ac_add_options --sharedstatedir=%{_sharedstatedir}
-ac_add_options --mandir=%{_mandir}
-ac_add_options --infodir=%{_infodir}
%if %{?debug:1}0
ac_add_options --disable-optimize
ac_add_options --enable-debug
ac_add_options --enable-crash-on-assert
%else
ac_add_options --disable-debug
-ac_add_options --disable-debug-modules
-ac_add_options --enable-optimize="%{rpmcflags}"
+ac_add_options --enable-optimize="%{rpmcflags}%{?with_pgo: -Os}"
%endif
ac_add_options --disable-strip
-ac_add_options --disable-strip-libs
ac_add_options --disable-install-strip
%if %{with tests}
ac_add_options --enable-tests
%else
ac_add_options --disable-tests
%endif
-ac_add_options --disable-mochitest
%endif
-ac_add_options --disable-cpp-exceptions
ac_add_options --disable-crashreporter
-ac_add_options --disable-elf-dynstr-gc
ac_add_options --disable-gconf
-ac_add_options --disable-gnomeui
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-javaxpcom
-ac_add_options --disable-long-long-warning
ac_add_options --disable-necko-wifi
-ac_add_options --disable-pedantic
ac_add_options --disable-updater
-ac_add_options --disable-xterm-updates
-ac_add_options --enable-canvas
+ac_add_options --enable-alsa
ac_add_options --enable-chrome-format=omni
ac_add_options --enable-default-toolkit=%{?with_gtk3:cairo-gtk3}%{!?with_gtk3:cairo-gtk2}
ac_add_options --enable-extensions=default
-ac_add_options --enable-gio
-ac_add_options --enable-gstreamer=1.0
-ac_add_options --enable-libxul
-ac_add_options --enable-mathml
-ac_add_options --enable-pango
ac_add_options --enable-readline
ac_add_options --enable-safe-browsing
%{?with_shared_js:ac_add_options --enable-shared-js}
ac_add_options --enable-startup-notification
-ac_add_options --enable-svg
ac_add_options --enable-system-cairo
ac_add_options --enable-system-ffi
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-url-classifier
-ac_add_options --enable-xinerama
%{?with_official:ac_add_options --enable-official-branding}
ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
ac_add_options --with-distribution-id=org.pld-linux
ac_add_options --with-pthreads
ac_add_options --with-system-bz2
-ac_add_options --with-system-icu
+ac_add_options --with%{!?with_system_icu:out}-system-icu
ac_add_options --with-system-jpeg
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
-ac_add_options --with-system-ply
ac_add_options --with-system-png
ac_add_options --with-system-zlib
ac_add_options --with-x
[ -n "$XVFB_PID" ] || exit 1
export DISPLAY=:${D}
%{__make} -j1 -f client.mk profiledbuild \
+ AUTOCONF=/usr/bin/autoconf2_13 \
DESTDIR=obj-%{_target_cpu}/dist \
- CC="%{__cc}" \
- CXX="%{__cxx}" \
MOZ_MAKE_FLAGS="%{_smp_mflags}"
kill $XVFB_PID
%else
%{__make} -j1 -f client.mk build \
- CC="%{__cc}" \
- CXX="%{__cxx}" \
+ AUTOCONF=/usr/bin/autoconf2_13 \
MOZ_MAKE_FLAGS="%{_smp_mflags}"
%endif
$RPM_BUILD_ROOT%{_desktopdir} \
$RPM_BUILD_ROOT%{_datadir}/%{name}/browser \
$RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins \
- $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/{lib,bin} \
$RPM_BUILD_ROOT%{_includedir}/%{name} \
- $RPM_BUILD_ROOT%{_datadir}/idl/%{name} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins
-cd obj-%{_target_cpu}
-%{__make} -C browser/installer stage-package libxul.pc libxul-embedding.pc mozilla-js.pc mozilla-plugin.pc \
+OBJDIR=obj-%{_target_cpu}
+%{__make} -C ${OBJDIR}/browser/installer stage-package \
DESTDIR=$RPM_BUILD_ROOT \
installdir=%{_libdir}/%{name} \
- INSTALL_SDK=1 \
PKG_SKIP_STRIP=1
-cp -aL browser/installer/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
-cp -aL dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
-cp -aL dist/idl/* $RPM_BUILD_ROOT%{_datadir}/idl/%{name}
-cp -aL dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -aL dist/include/xpcom-config.h $RPM_BUILD_ROOT%{_libdir}/%{name}-devel
-cp -aL dist/sdk/lib/* $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib
-cp -aL dist/sdk/bin/* $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/bin
-find $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk -name "*.pyc" | xargs rm -f
-
-ln -s %{_libdir}/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/bin
-ln -s %{_includedir}/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/include
-ln -s %{_datadir}/idl/%{name} $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/idl
-ln -s %{_libdir}/%{name}-devel/sdk/lib $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/lib
-
-# replace copies with symlinks
-%{?with_shared_js:ln -sf %{_libdir}/%{name}/libmozjs.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozjs.so}
-ln -sf %{_libdir}/%{name}/libxul.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxul.so
-# temp fix for https://bugzilla.mozilla.org/show_bug.cgi?id=63955
-chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/bin/xpt.py
+cp -aL ${OBJDIR}/dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
# move arch independant ones to datadir
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/icons
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/{pref,preferences}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/chrome
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/icons
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/{pref,preferences}
ln -s ../../../share/%{name}/browser/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/chrome
ln -s ../../../share/%{name}/browser/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/defaults
# install icons and desktop file
for i in 16 32 48 %{?with_official:22 24 256}; do
install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps
- cp -a ../browser/branding/%{!?with_official:un}official/default${i}.png \
+ cp -a browser/branding/%{!?with_official:un}official/default${i}.png \
$RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/firefox.png
done
cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js
%endif
-# files created by firefox -register
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/compreg.dat
-touch $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/components/xpti.dat
-
cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
#!/bin/sh
umask 022
EOF
chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
+# GeckoMediaPlugin API headers
+install -d $RPM_BUILD_ROOT%{_includedir}
+cp -pr dom/media/gmp/gmp-api $RPM_BUILD_ROOT%{_includedir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
%dir %{_libdir}/%{name}/browser
-%dir %{_libdir}/%{name}/browser/components
%dir %{_libdir}/%{name}/browser/plugins
%dir %{_libdir}/%{name}/browser/features
%attr(755,root,root) %{_libdir}/%{name}/firefox
%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
+%attr(755,root,root) %{_libdir}/%{name}/pingsender
%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
%{_libdir}/%{name}/application.ini
+%{_libdir}/%{name}/chrome.manifest
%{_libdir}/%{name}/browser/blocklist.xml
%{_libdir}/%{name}/browser/chrome.manifest
-%{_libdir}/%{name}/browser/components/components.manifest
-%attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so
# the signature of the default theme
%{_datadir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
%{_libdir}/%{name}/browser/omni.ja
-%{_libdir}/%{name}/webapprt
-%attr(755,root,root) %{_libdir}/%{name}/webapprt-stub
-%{_libdir}/%{name}/browser/features/loop@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/aushelper@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/clicktoplay-rollout@mozilla.org.xpi
%{_libdir}/%{name}/browser/features/e10srollout@mozilla.org.xpi
%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi
-
-# files created by firefox -register
-%ghost %{_libdir}/%{name}/browser/components/compreg.dat
-%ghost %{_libdir}/%{name}/browser/components/xpti.dat
+%{_libdir}/%{name}/browser/features/followonsearch@mozilla.com.xpi
+%{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/shield-recipe-client@mozilla.org.xpi
+%{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi
%attr(755,root,root) %{_libdir}/%{name}/plugin-container
%{_libdir}/%{name}/dictionaries
+%dir %{_libdir}/%{name}/fonts
+%{_libdir}/%{name}/fonts/EmojiOneMozilla.ttf
+
%dir %{_libdir}/%{name}/gmp-clearkey
%dir %{_libdir}/%{name}/gmp-clearkey/0.1
-%{_libdir}/%{name}/gmp-clearkey/0.1/clearkey.info
+%{_libdir}/%{name}/gmp-clearkey/0.1/manifest.json
%attr(755,root,root) %{_libdir}/%{name}/gmp-clearkey/0.1/libclearkey.so
+%{!?with_system_icu:%{_libdir}/%{name}/icudt58l.dat}
-%files libs
-%defattr(644,root,root,755)
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/platform.ini
%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
%attr(755,root,root) %{_libdir}/%{name}/libxul.so
%attr(755,root,root) %{_libdir}/%{name}/libmozavcodec.so
%attr(755,root,root) %{_libdir}/%{name}/libmozavutil.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so
%{_libdir}/%{name}/dependentlibs.list
%{_libdir}/%{name}/omni.ja
+%if %{with gtk3}
+%dir %{_libdir}/%{name}/gtk2
+%attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so
+%attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so
+%endif
-%files devel
+%files -n gmp-api
%defattr(644,root,root,755)
-%{_includedir}/%{name}
-%{_datadir}/idl/%{name}
-%dir %{_libdir}/%{name}-devel
-%{_libdir}/%{name}-devel/bin
-%{_libdir}/%{name}-devel/idl
-%{_libdir}/%{name}-devel/lib
-%{_libdir}/%{name}-devel/include
-%{_libdir}/%{name}-devel/*.h
-%dir %{_libdir}/%{name}-devel/sdk
-%{_libdir}/%{name}-devel/sdk/lib
-%dir %{_libdir}/%{name}-devel/sdk/bin
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/header.py
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/run-mozilla.sh
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/typelib.py
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/xpcshell
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/xpidl.py
-%{_libdir}/%{name}-devel/sdk/bin/xpidllex.py
-%{_libdir}/%{name}-devel/sdk/bin/xpidlyacc.py
-%attr(755,root,root) %{_libdir}/%{name}-devel/sdk/bin/xpt.py
-%{_libdir}/%{name}-devel/sdk/bin/ply
-
-%{_pkgconfigdir}/libxul.pc
-%{_pkgconfigdir}/libxul-embedding.pc
-%{_pkgconfigdir}/mozilla-js.pc
-%{_pkgconfigdir}/mozilla-plugin.pc
+%{_includedir}/gmp-api