X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=48f1755367d4d870f1ff95535cfa7e6bfebb2d51;hb=bad3785195e3cc440b3d14b14ab995d16ba84e06;hp=a388f6c18ce1b0131e334bd959d1affd8e8d5fc3;hpb=4ad6eb3db8a6cb0890d397249f54b026439b9b89;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index a388f6c..48f1755 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -1,24 +1,22 @@
 #
 # TODO:
 # - handle locales differently (runtime, since it's possible to do)
-# - move most of %%post to external script as it's done in debian
 # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
 #   for hints how to make locales and other stuff like extensions working
-# - SECURITY: http://securitytracker.com/alerts/2004/Sep/1011318.html
 #
 # 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
-Release:	2
+Version:	1.0.6
+Release:	1
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0/source/firefox-1.0-source.tar.bz2
-# Source0-md5:	49c16a71f4de014ea471be81e46b1da8
+Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
+# Source0-md5:	7b4c1d10d478dcb4c52fbbe3e41745d9
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-alpha-gcc3.patch
@@ -26,10 +24,12 @@ 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}
-BuildRequires:	freetype-devel >= 1:2.1.8
+BuildRequires:	freetype-devel >= 1:2.1.9
 %else
 BuildRequires:	freetype-devel >= 2.1.3
 BuildRequires:	freetype-devel < 1:2.1.8
@@ -43,14 +43,15 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	nspr-devel >= 1:4.6-0.20041030.1
 BuildRequires:	nss-devel >= 3.8
 BuildRequires:	pango-devel >= 1:1.1.0
-BuildRequires:	perl(Time::localtime)
+BuildRequires:	perl-modules
+BuildRequires:	pkgconfig
 BuildRequires:	zip
+BuildRequires:  heimdal-devel >= 0.7
 Requires:	%{name}-lang-resources = %{version}
 %if %{with ft218}
 Requires:	freetype >= 1:2.1.3
 %else
 Requires:	freetype >= 2.1.3
-Requires:	freetype < 1:2.1.8
 Conflicts:	freetype = 2.1.8
 %endif
 Requires:	nspr >= 1:4.6-0.20041030.1
@@ -71,6 +72,20 @@ compliance, performance and portability.
 Mozilla Firefox jest open sourcow± przegl±dark± sieci WWW, stworzon± z
 my¶l± o zgodno¶ci ze standardami, wydajno¶ci± i przeno¶no¶ci±.
 
+%package devel
+Summary:	Headers for developing programs that will use Mozilla Firefox
+Summary(pl):	Mozilla Firefox - pliki nag³ówkowe i biblioteki
+Group:		X11/Development/Libraries
+Obsoletes:	mozilla-devel
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	nspr-devel >= 1:4.6-0.20041030.1
+
+%description devel
+Mozilla development package.
+
+%description devel -l pl
+Biblioteki i pliki nag³ówkowe.
+
 %package lang-en
 Summary:	English resources for Mozilla-firefox
 Summary(pl):	Anglojêzyczne zasoby dla Mozilla-FireFox
@@ -93,10 +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"
@@ -149,15 +167,17 @@ cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
-
+install -d \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
+	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
+	$RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
+	
 %{__make} -C xpinstall/packager \
 	MOZ_PKG_APPNAME="mozilla-firefox" \
 	MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \
 	EXCLUDE_NSPR_LIBS=1
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
-sed -i $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -e "s@/usr/lib/@%{_libdir}/@g"
 
 tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*-linux-gnu.tar.gz
 
@@ -170,17 +190,47 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 grep locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-en-US-installed-chrome.txt
 grep -v locale $RPM_BUILD_ROOT%{_firefoxdir}/chrome/installed-chrome.txt > $RPM_BUILD_ROOT%{_firefoxdir}/chrome/%{name}-misc-installed-chrome.txt
 
-rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki toolkit
+rm -rf US classic comm embed-sample en-{US,mac,unix,win} modern pipnss pippki
 rm -f en-win.jar en-mac.jar embed-sample.jar modern.jar
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# header/developement files
+cp -rfL dist/include/*	$RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -rfL dist/idl/*	$RPM_BUILD_ROOT%{_includedir}/%{name}/idl
 
-%post
+install dist/bin/regchrome $RPM_BUILD_ROOT%{_bindir}
+install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
+install dist/bin/xpidl $RPM_BUILD_ROOT%{_bindir}
+install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
+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 \
+	    > $RPM_BUILD_ROOT%{_pkgconfigdir}/$(basename $f)
+done
+
+# already provided by standalone packages
+rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc
+
+sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc
+
+# includedir/dom CFLAGS		
+sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \
+	$RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc
+	
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
+#!/bin/sh
 umask 022
 cat %{_firefoxdir}/chrome/*-installed-chrome.txt > %{_firefoxdir}/chrome/installed-chrome.txt
-
-unset MOZILLA_FIVE_HOME || :
+rm -f %{_firefoxdir}/chrome/{chrome.rdf,overlayinfo/*/*/*.rdf}
+rm -f %{_firefoxdir}/components/{compreg,xpti}.dat
 MOZILLA_FIVE_HOME=%{_firefoxdir}
 export MOZILLA_FIVE_HOME
 
@@ -192,25 +242,29 @@ export PATH
 LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
-/sbin/ldconfig || :
+unset TMPDIR TMP || :
+%{_firefoxdir}/regxpcom
+%{_firefoxdir}/regchrome
+%{_firefoxdir}/firefox -register
+EOF
 
-%{_firefoxdir}/regxpcom >/dev/null  || echo "E: regxpcom was exited: $?" >&2
-%{_firefoxdir}/regchrome >/dev/null || echo "E: regchrome was exited: $?" >&2
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%{_firefoxdir}/firefox -register
+%post
+%{_sbindir}/firefox-chrome+xpcom-generate
 
 %postun
 if [ "$1" != "0" ]; then
-	umask 022
-	cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installed-chrome.txt
+	%{_sbindir}/firefox-chrome+xpcom-generate
 fi
 
 %preun
 if [ "$1" == "0" ]; then
-  rm -rf %{_firefoxdir}/chrome/overlayinfo
-  rm -rf %{_firefoxdir}/components
-  rm -f  %{_firefoxdir}/chrome/*.rdf
-  rm -rf %{_firefoxdir}/extensions
+	rm -rf %{_firefoxdir}/chrome/overlayinfo
+	rm -f  %{_firefoxdir}/chrome/*.rdf
+	rm -rf %{_firefoxdir}/components
+	rm -rf %{_firefoxdir}/extensions
 fi
 
 %post lang-en
@@ -223,7 +277,8 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/mozilla*
+%attr(755,root,root) %{_sbindir}/*
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
 %dir %{_firefoxdir}/components
@@ -259,7 +314,7 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 #%{_firefoxdir}/chrome/content-packs.jar
 %{_firefoxdir}/chrome/help.jar
 # -dom-inspector subpackage?
-#%{_firefoxdir}/chrome/inspector.jar
+%{_firefoxdir}/chrome/inspector.jar
 %{_firefoxdir}/chrome/modern.jar
 %{_firefoxdir}/chrome/pip*.jar
 %{_firefoxdir}/chrome/toolkit.jar
@@ -267,6 +322,16 @@ cat %{_firefoxdir}/chrome/*-installed-chrome.txt >%{_firefoxdir}/chrome/installe
 %dir %{_firefoxdir}/chrome/icons
 %{_firefoxdir}/chrome/icons/default
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/regchrome
+%attr(755,root,root) %{_bindir}/regxpcom
+%attr(755,root,root) %{_bindir}/xpidl
+%attr(755,root,root) %{_bindir}/xpt_dump
+%attr(755,root,root) %{_bindir}/xpt_link
+%{_includedir}/%{name}
+%{_pkgconfigdir}/*
+
 %files lang-en
 %defattr(644,root,root,755)
 %{_firefoxdir}/chrome/en-US.jar