- 1.0.6

[packages/firefox.git] / mozilla-firefox.spec

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 3aaf8fe5c4e17373bad004b44bdebfe047e12978..48f1755367d4d870f1ff95535cfa7e6bfebb2d51 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -6,17 +6,17 @@
 #
 # Conditional build:
 %bcond_with    tests   # enable tests (whatever they check)
-%bcond_with    ft218   # compile with freetype >= 2.1.8
+%bcond_without ft218   # compile with freetype < 2.1.8
 #
 Summary:       Mozilla Firefox web browser
 Summary(pl):   Mozilla Firefox - przegl±darka WWW
 Name:          mozilla-firefox
-Version:       1.0.4
-Release:       3
+Version:       1.0.6
+Release:       1
 License:       MPL/LGPL
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 0f5d0586750fde79ba98ecf3ee4425a7
+# Source0-md5: 7b4c1d10d478dcb4c52fbbe3e41745d9
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-alpha-gcc3.patch
@@ -24,6 +24,8 @@ Patch1:               %{name}-gfx.patch
 Patch2:                %{name}-nss.patch
 Patch3:                %{name}-lib_path.patch
 Patch4:                %{name}-freetype.patch
+Patch5:                %{name}-searchplugins.patch
+Patch6:                %{name}-gcc-bugs.patch
 URL:           http://www.mozilla.org/projects/firefox/
 BuildRequires: automake
 %if %{with ft218}
@@ -44,7 +46,7 @@ BuildRequires:        pango-devel >= 1:1.1.0
 BuildRequires: perl-modules
 BuildRequires: pkgconfig
 BuildRequires: zip
-BuildRequires:  heimdal-devel
+BuildRequires:  heimdal-devel >= 0.7
 Requires:      %{name}-lang-resources = %{version}
 %if %{with ft218}
 Requires:      freetype >= 1:2.1.3
@@ -106,11 +108,13 @@ Angloj
 %patch2 -p1
 %patch3 -p1
 %{?with_ft218:%patch4 -p1}
+%patch5 -p0
+%patch6 -p0
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %build
-export CFLAGS="%{rpmcflags}"
-export CXXFLAGS="%{rpmcflags}"
+export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
+export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export MOZ_PHOENIX="1"
 export BUILD_OFFICIAL="1"
 export MOZILLA_OFFICIAL="1"
@@ -202,6 +206,9 @@ install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir}
 ln -sf %{_includedir}/mozilla-firefox/necko/nsIURI.h \
        $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
        
+# CA certificates
+ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_firefoxdir}/libnssckbi.so
+
 # pkgconfig files
 for f in build/unix/*.pc ; do
         sed -e 's/firefox-%{version}/mozilla-firefox/' $f \