- fix building with freetypr 2.6

[packages/iceweasel.git] / iceweasel.spec

diff --git a/iceweasel.spec b/iceweasel.spec
index 03ae89f938899e974245460d1617f2c9c9f593b7..1f474a228331c54ba422fc68b93d84348a3d2283 100644 (file)
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -15,21 +15,21 @@
 # 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.10.6
+%define                nspr_ver        4.10.8
 %define                nss_ver         3.18.1
 
 Summary:       Iceweasel web browser
 Summary(hu.UTF-8):     Iceweasel web böngésző
 Summary(pl.UTF-8):     Iceweasel - przeglądarka WWW
 Name:          iceweasel
-Version:       38.0.1
+Version:       38.0.5
 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.bz2
-# Source0-md5: 3c496e4ec072327b1ef2b820f15dff26
+# Source0-md5: 60466afbc7105d29dcd18f996c9c67e0
 Source1:       %{name}-branding.tar.xz
-# Source1-md5: 67943883323103080d4a312bebb30a6a
+# Source1-md5: aacc7e8298a3e6aa3ef2a3613a62f635
 Source2:       %{name}-rm_nonfree.sh
 Source3:       %{name}.desktop
 Source4:       %{name}.sh
@@ -48,6 +48,7 @@ Patch9:               %{name}-middle_click_paste.patch
 Patch10:       %{name}-packaging.patch
 Patch11:       system-virtualenv.patch
 Patch12:       Disable-Firefox-Health-Report.patch
+Patch13:       freetype-2.6.patch
 URL:           http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires: OpenGL-devel
 BuildRequires: ImageMagick
@@ -57,17 +58,18 @@ BuildRequires:      automake
 BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.10.2-5
 BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: freetype-devel >= 1:2.1.8
+BuildRequires: freetype-devel >= 1:2.6
 BuildRequires: gcc-c++ >= 6:4.4
-BuildRequires: glib2-devel >= 1:2.20
+BuildRequires: glib2-devel >= 1:2.22
 BuildRequires: gstreamer-devel >= 1.0
 BuildRequires: gstreamer-plugins-base-devel >= 1.0
-%{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.14}
-%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.0.0}
+%{!?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: libIDL-devel >= 0.8.0
-BuildRequires: libdnet-devel
+# 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
@@ -78,7 +80,7 @@ BuildRequires:        libjpeg-turbo-devel
 # for rsvg-convert
 BuildRequires: librsvg
 BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 2:1.6.13
+BuildRequires: libpng-devel >= 2:1.6.16
 BuildRequires: libstdc++-devel >= 6:4.4
 BuildRequires: libvpx-devel >= 1.3.0
 BuildRequires: nspr-devel >= 1:%{nspr_ver}
@@ -131,7 +133,7 @@ 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      libmozalloc.so libmozjs.so libxpcom.so libxul.so
+%define                _noautoreq      libmozalloc.so libmozjs.so libxul.so
 
 %description
 Iceweasel is an open-source web browser, designed for standards
@@ -152,11 +154,11 @@ Summary(pl.UTF-8):        Biblioteki współdzielone Iceweasela
 Group:         X11/Libraries
 Requires:      cairo >= 1.10.2-5
 Requires:      dbus-glib >= 0.60
-Requires:      glib2 >= 1:2.20
-%{!?with_gtk3:Requires:        gtk+2 >= 2:2.14}
-%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
+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.13
+Requires:      libpng >= 2:1.6.16
 Requires:      libpng(APNG) >= 0.10
 Requires:      libvpx >= 1.3.0
 Requires:      pango >= 1:1.22.0
@@ -216,6 +218,7 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch10 -p1
 %patch11 -p2
 %patch12 -p1
+%patch13 -p1
 
 cp -a xulrunner/installer/*.pc.in browser/installer/