X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=efd792f4f12090b2b2756cf92a78eee57a634a28;hb=d3b02e37e3861bde8db1d892fc3ccbcd028a408f;hp=f28162ac308db642c3556447b0d7b695614548c3;hpb=5cff4e9b18e811678e4044f4b7921ec174765789;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index f28162a..efd792f 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -17,12 +17,12 @@
 Summary:	Mozilla Firefox web browser
 Summary(pl):	Mozilla Firefox - przegl±darka WWW
 Name:		mozilla-firefox
-Version:	1.5.0.1
-Release:	4
+Version:	1.5.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:	c76f02956645bc823241379e27f76bb5
+# Source0-md5:	4cb3d7c1b5345585750766c589308b5e
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-nss.patch
@@ -30,8 +30,6 @@ Patch1:		%{name}-lib_path.patch
 Patch2:		%{name}-nss-system-nspr.patch
 Patch3:		%{name}-nopangoxft.patch
 Patch4:		%{name}-name.patch
-Patch5:		%{name}-dumpstack.patch
-Patch6:		%{name}-pango-typo.patch
 # UPDATE or DROP?
 #PatchX:	%{name}-searchplugins.patch
 URL:		http://www.mozilla.org/projects/firefox/
@@ -45,16 +43,18 @@ BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnome:BuildRequires:	libgnome-devel >= 2.0}
 %{?with_gnome:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libjpeg-devel >= 6b
-BuildRequires:	libpng-devel >= 1.2.0
+BuildRequires:	libpng-devel >= 1.2.7
 BuildRequires:	libstdc++-devel
-BuildRequires:	nspr-devel >= 1:4.6.1
+BuildRequires:	nspr-devel >= 1:4.6.1-2
 BuildRequires:	nss-devel >= 3.10.2
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
 BuildRequires:	pkgconfig
+BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zip
+BuildRequires:	zlib-devel >= 1.2.3
 Requires:	%{name}-lang-resources = %{version}
-Requires:	nspr >= 1:4.6.1
+Requires:	nspr >= 1:4.6.1-2
 Requires:	nss >= 3.10.2
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
@@ -63,7 +63,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_firefoxdir	%{_libdir}/%{name}
 # mozilla and firefox provide their own versions
 %define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so
-%define		_noautoprovfiles	libplc4.so libplds4.so
+
+%define		specflags	-fno-strict-aliasing
 
 %description
 Mozilla Firefox is an open-source web browser, designed for standards
@@ -78,7 +79,7 @@ Summary:	Headers for developing programs that will use Mozilla Firefox
 Summary(pl):	Mozilla Firefox - pliki nag³ówkowe
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	nspr-devel >= 1:4.6.1
+Requires:	nspr-devel >= 1:4.6.1-2
 Obsoletes:	mozilla-devel
 
 %description devel
@@ -109,8 +110,6 @@ Angloj
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
-%patch6 -p0
 
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
@@ -187,10 +186,11 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-png
 ac_add_options --with-system-zlib
+ac_cv_visibility_pragma=no
 EOF
 
 %{__make} -j1 -f client.mk build \
-	CC="%{__cc} -fno-strict-aliasing" \
+	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
 %install
@@ -278,29 +278,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{_sbindir}/firefox-chrome+xpcom-generate
-%banner %{name} -e <<EOF
-###################################################################
-#                                                                 #
-# NOTICE:                                                         #
-# If you have problem with upgrade old mozilla-firefox 1.0.x, you #
-# should remove it first.                                         #
-#                                                                 #
-###################################################################
-EOF
 
 %postun
-if [ "$1" != "0" ]; then
-	%{_sbindir}/firefox-chrome+xpcom-generate
-fi
-
-%preun
-if [ "$1" == "0" ]; then
+if [ "$1" = "0" ]; then
 	rm -rf %{_firefoxdir}/chrome/overlayinfo
 	rm -f  %{_firefoxdir}/chrome/*.rdf
 	rm -rf %{_firefoxdir}/components
 	rm -rf %{_firefoxdir}/extensions
 fi
 
+%triggerpostun -- %{name} < 1.5
+%banner %{name} -e <<EOF
+NOTICE:
+If you have problem with upgrade from old mozilla-firefox 1.0.x,
+you should remove it first and reinstall %{name}-%{version}
+EOF
+
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mozilla*
@@ -312,7 +305,8 @@ fi
 %attr(755,root,root) %{_firefoxdir}/components/*.so
 %{_firefoxdir}/components/*.js
 %{_firefoxdir}/components/*.xpt
-%{_firefoxdir}/plugins
+%dir %{_firefoxdir}/plugins
+%attr(755,root,root) %{_firefoxdir}/plugins/*.so
 %{_firefoxdir}/searchplugins
 %{_firefoxdir}/icons
 %{_firefoxdir}/defaults