X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mozilla-firefox.spec;h=0a0eb7ea8f75646c9ee92638c549a8e1093259ba;hb=33f817264b58dc5b02a52e529c1c3bd1b6fe8200;hp=c77872cc535dd4a15629b163d19d7c268ff672f1;hpb=6d77929ce21c83173544a8f4f86df53930fdd506;p=packages%2Ffirefox.git

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index c77872c..0a0eb7e 100644
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -1,24 +1,34 @@
 #
 # 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
+# - unpackaged files check
+#   /usr/lib/mozilla-firefox/LICENSE
+#   /usr/lib/mozilla-firefox/README.txt
+#   /usr/lib/mozilla-firefox/browserconfig.properties
+#   /usr/lib/mozilla-firefox/chrome/chatzilla.jar
+#   /usr/lib/mozilla-firefox/chrome/chromelist.txt
+#   /usr/lib/mozilla-firefox/chrome/content-packs.jar
+#   /usr/lib/mozilla-firefox/chrome/embed-sample.jar
+#   /usr/lib/mozilla-firefox/chrome/installed-chrome.txt
+#   /usr/lib/mozilla-firefox/components/myspell/en-US.aff
+#   /usr/lib/mozilla-firefox/components/myspell/en-US.dic
+#   /usr/lib/mozilla-firefox/init.d/README
 #
 # 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.1
+Version:	1.0.7
+Release:	0.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:	5704a8c36de84b408e069afb0c5bc1df
 Source1:	%{name}.desktop
 Source2:	%{name}.sh
 Patch0:		%{name}-alpha-gcc3.patch
@@ -26,16 +36,19 @@ 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
 BuildConflicts:	freetype-devel = 2.1.8
 %endif
 BuildRequires:	gtk+2-devel >= 1:2.0.0
+BuildRequires:	heimdal-devel >= 0.7
 BuildRequires:	libIDL-devel >= 0.8.0
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.0
@@ -43,14 +56,14 @@ 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
 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 +84,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
@@ -87,77 +114,95 @@ English resources for Mozilla-firefox
 Anglojêzyczne zasoby dla Mozilla-FireFox
 
 %prep
-%setup -q -n mozilla
+%setup -q -c
+cd mozilla
 %patch0 -p1
 %patch1 -p1
 %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 MOZ_PHOENIX="1"
-export BUILD_OFFICIAL="1"
-export MOZILLA_OFFICIAL="1"
+cd mozilla
+rm -f .mozconfig
+export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
+export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 
 cp -f %{_datadir}/automake/config.* build/autoconf
 cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
-%configure2_13 \
+
+LIBIDL_CONFIG="%{_bindir}/libIDL-config-2"; export LIBIDL_CONFIG
+
+echo << EOF > .mozconfig
+. $topsrcdir/browser/config/mozconfig
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+ac_add_options --enable-optimize="%{rpmcflags}"
 %if %{?debug:1}0
-	--enable-debug \
-	--enable-debug-modules \
+ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
 %else
-	--disable-debug \
-	--disable-debug-modules \
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
 %endif
-	--disable-composer \
-	--disable-dtd-debug \
-	--disable-installer \
-	--disable-jsd \
-	--disable-ldap \
-	--disable-mailnews \
 %if %{with tests}
-	--enable-tests \
+ac_add_options --enable-tests
 %else
-	--disable-tests \
+ac_add_options --disable-tests
 %endif
-	--disable-xprint \
-	--enable-crypto \
-	--enable-freetype2 \
-	--enable-mathml \
-	--enable-optimize="%{rpmcflags}" \
-	--enable-plaintext-editor-only \
-	--enable-reorder \
-	--enable-strip \
-	--enable-strip-libs \
-	--enable-xinerama \
-	--enable-xft \
-	--enable-default-toolkit="gtk2" \
-	--with-pthreads \
-	--with-system-nspr \
-	--with-system-jpeg \
-	--with-system-png \
-	--with-system-zlib \
-	--enable-single-profile \
-	--disable-profilesharing \
-	--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
-	
+ac_add_options --disable-composer
+ac_add_options --disable-dtd-debug
+ac_add_options --disable-installer
+ac_add_options --disable-jsd
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --disable-xprint
+ac_add_options --disable-profilesharing
+ac_add_options --enable-xpctools
+ac_add_options --enable-native-uconv
+ac_add_options --enable-crypto
+ac_add_options --enable-freetype2
+ac_add_options --enable-mathml
+ac_add_options --enable-reorder
+ac_add_options --enable-strip
+ac_add_options --enable-strip-libs
+ac_add_options --enable-xinerama
+ac_add_options --enable-xft
+ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --with-pthreads
+ac_add_options --with-system-nspr
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+ac_add_options --enable-single-profile
+EOF
 
-%{__make}
+%{__make} -f client.mk build \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}}
-
+cd mozilla
+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,10 +215,42 @@ 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
 
-cat << EOF > $RPM_BUILD_ROOT%{_sbindir}/firefox-chrome+xpcom-generate
+# header/developement files
+cp -rfL dist/include/*	$RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -rfL dist/idl/*	$RPM_BUILD_ROOT%{_includedir}/%{name}/idl
+
+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
@@ -190,6 +267,7 @@ export PATH
 LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
+unset TMPDIR TMP || :
 %{_firefoxdir}/regxpcom
 %{_firefoxdir}/regchrome
 %{_firefoxdir}/firefox -register
@@ -224,7 +302,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
@@ -268,6 +347,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