- no need to _noautoreqdep sonames already eliminated by _noautoreq

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

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index 2efe062055e4d4d8255d44b78c50645a9bee693d..28ada85c3213435fd0970c6b341d072e1d41a4aa 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -11,12 +11,12 @@
 Summary:       Firefox Community Edition web browser
 Summary(pl.UTF-8):     Firefox Community Edition - przeglądarka WWW
 Name:          mozilla-firefox
-Version:       2.0.0.2
-Release:       3
+Version:       2.0.0.4
+Release:       1
 License:       MPL/LGPL
 Group:         X11/Applications/Networking
 Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: d7db87b76c1e78a229b662d7dd642265
+# Source0-md5: 99c14794976b2532addfcd2d836c6bb2
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                mozilla-install.patch
@@ -24,10 +24,6 @@ Patch1:              %{name}-lib_path.patch
 Patch3:                %{name}-nopangoxft.patch
 Patch5:                %{name}-fonts.patch
 Patch69:       %{name}-agent.patch
-# drop as soon as bug is fixed since it's so ugly hack
-# fixing symptoms only
-# https://bugzilla.mozilla.org/show_bug.cgi?id=362462
-Patch6:                mozilla-hack-gcc_4_2.patch
 Patch7:                %{name}-myspell.patch
 # if ac rebuild is needed...
 #PatchX:               %{name}-ac.patch
@@ -37,7 +33,7 @@ BuildRequires:        automake
 BuildRequires: cairo-devel >= 1.0.0
 %{?with_gnome:BuildRequires:   gnome-vfs2-devel >= 2.0}
 BuildRequires: gtk+2-devel >= 1:2.0.0
-BuildRequires: heimdal-devel >= 0.7.1
+BuildRequires: krb5-devel
 BuildRequires: libIDL-devel >= 0.8.0
 %{?with_gnome:BuildRequires:   libgnome-devel >= 2.0}
 %{?with_gnome:BuildRequires:   libgnomeui-devel >= 2.2.0}
@@ -68,13 +64,13 @@ Provides:   wwwbrowser
 Obsoletes:     mozilla-firebird
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# mozilla and firefox provide their own versions
-%define                _noautoreqdep           libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so
+# firefox/thunderbird/seamonkey provide their own versions
+%define                _noautoreqdep           libgkgfx.so libgtkxtbin.so libjsj.so libxpcom_compat.so libxpcom_core.so
 %define                _noautoprovfiles        %{_libdir}/%{name}/components
 # we don't want these to satisfy xulrunner-devel
-%define                _noautoprov                     libmozjs.so libxpcom.so libxul.so
+%define                _noautoprov             libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 # and as we don't provide them, don't require either
-%define                _noautoreq                      libmozjs.so libxpcom.so libxul.so
+%define                _noautoreq              libgtkembedmoz.so libmozjs.so libxpcom.so libxul.so
 
 %define                specflags       -fno-strict-aliasing -fno-tree-vrp -fno-stack-protector
 
@@ -83,9 +79,9 @@ Firefox Community Edition is an open-source web browser, designed for
 standards compliance, performance and portability.
 
 %description -l pl.UTF-8
-Firefox Community Edition jest open sourcową przeglądarką sieci WWW,
-stworzoną z myślą o zgodności ze standardami, wydajnością i
-przenośnością.
+Firefox Community Edition jest przeglądarką WWW rozpowszechnianą
+zgodnie z ideami ruchu otwartego oprogramowania oraz tworzoną z myślą
+o zgodności ze standardami, wydajnością i przenośnością.
 
 %package libs
 Summary:       Firefox Community Edition shared libraries
@@ -119,12 +115,9 @@ cd mozilla
 %patch1 -p1
 %patch3 -p1
 %patch5 -p1
-%patch6 -p2
 %patch7 -p1
 %patch69 -p1
 
-sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
-
 # use system
 #rm -rf mozilla/nsprpub mozilla/security/nss
 
@@ -275,7 +268,7 @@ EOF
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pretrans
 if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
        mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
 fi