SPECS: mozilla-firefox.spec - cleanups, order configure options - ...

glen glen at pld-linux.org
Sun Oct 28 11:18:14 CET 2007 

Author: glen                         Date: Sun Oct 28 10:18:14 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups, order configure options
- build to obj dir
- drop -lang-en (included in main pkg)

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.219 -> 1.220) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.219 SPECS/mozilla-firefox.spec:1.220
--- SPECS/mozilla-firefox.spec:1.219	Tue Oct 23 16:54:48 2007
+++ SPECS/mozilla-firefox.spec	Sun Oct 28 11:18:08 2007
@@ -23,7 +23,7 @@
 Summary(pl.UTF-8):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	%{firefox_ver}
-Release:	2
+Release:	3
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -69,12 +69,12 @@
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
 Requires(post):	mktemp >= 1.5-18
-Requires:	%{name}-lang-resources = %{version}
 Requires:	browser-plugins >= 2.0
 Requires:	nspr >= 1:4.6.3
 Requires:	nss >= 1:3.11.3
 Provides:	wwwbrowser
 Obsoletes:	mozilla-firebird
+Obsoletes:	mozilla-firefox-lang-en < 2.0.0.8-3
 Obsoletes:	mozilla-firefox-libs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -116,20 +116,6 @@
 poprawności HTML-a w Firefoksie. Liczbę błędów na przeglądanej stronie
 HTML można zobaczyć w postaci ikony na pasku stanu.
 
-%package lang-en
-Summary:	English resources for Firefox Community Edition
-Summary(pl.UTF-8):	Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition
-Version:	%{firefox_ver}
-Group:		X11/Applications/Networking
-Requires:	%{name} = %{firefox_ver}-%{release}
-Provides:	%{name}-lang-resources = %{firefox_ver}-%{release}
-
-%description lang-en
-English resources for Firefox Community Edition.
-
-%description lang-en -l pl.UTF-8
-Anglojęzyczne zasoby dla przeglądarki Firefox Community Edition.
-
 %prep
 %setup -qc %{?with_tidy:-a1}
 %if %{with tidy}
@@ -145,13 +131,8 @@
 %patch4 -p1
 %patch5 -p1
 
-# use system
-#rm -rf mozilla/nsprpub mozilla/security/nss
-
 %build
 cd mozilla
-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
@@ -160,6 +141,9 @@
 cat << 'EOF' > .mozconfig
 . $topsrcdir/browser/config/mozconfig
 
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
+ac_cv_visibility_pragma=no
+
 # Options for 'configure' (same as command-line options).
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
@@ -182,6 +166,7 @@
 ac_add_options --enable-crash-on-assert
 %else
 ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
 ac_add_options --disable-logging
 ac_add_options --enable-optimize="%{rpmcflags}"
 %endif
@@ -210,13 +195,12 @@
 ac_add_options --enable-system-myspell
 ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-zlib
-ac_add_options --with-system-jpeg
 ac_add_options --with-system-png
+ac_add_options --with-system-zlib
 ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
-ac_cv_visibility_pragma=no
 EOF
 
 %{__make} -j1 -f client.mk build \
@@ -233,7 +217,7 @@
 
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
-%{__make} -C xpinstall/packager stage-package \
+%{__make} -C obj-%{_target_cpu}/xpinstall/packager stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
@@ -612,11 +596,6 @@
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
 
-%files lang-en
-%defattr(644,root,root,755)
-%{_datadir}/%{name}/chrome/en-US.jar
-%{_datadir}/%{name}/chrome/en-US.manifest
-
 %if %{with tidy}
 %files addon-tidy
 %defattr(644,root,root,755)
@@ -630,6 +609,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2007/10/28 10:18:08  glen
+- cleanups, order configure options
+- build to obj dir
+- drop -lang-en (included in main pkg)
+
 Revision 1.219  2007/10/23 14:54:48  glen
 - drop -libs, no apps should be built against firefox (use xulrunner); rel 2
 
@@ -727,7 +711,7 @@
 
 Revision 1.191  2007/05/31 16:23:13  shadzik
 - 2.0.0.4
-[fixes CVE-2007-1362 CVE-2007-2867 CVE-2007-2868 CVE-2007-2869 CVE-2007-2870 CVE-2007-2871]
+  [fixes CVE-2007-1362 CVE-2007-2867 CVE-2007-2868 CVE-2007-2869 CVE-2007-2870 CVE-2007-2871]
 
 Revision 1.190  2007/04/09 19:56:27  arekm
 - rebuild with pretrans
@@ -775,9 +759,9 @@
 
 Revision 1.177  2007/02/23 20:40:01  rotom
 - up to 2.0.0.2
-[fixes CVE-2006-6077 CVE-2007-0008 CVE-2007-0009 CVE-2007-0775 CVE-2007-0776
- CVE-2007-0777 CVE-2007-0778 CVE-2007-0779 CVE-2007-0780 CVE-2007-0800
- CVE-2007-0981 CVE-2007-0994 CVE-2007-0995 CVE-2007-0996 CVE-2007-1092]
+  [fixes CVE-2006-6077 CVE-2007-0008 CVE-2007-0009 CVE-2007-0775 CVE-2007-0776
+  CVE-2007-0777 CVE-2007-0778 CVE-2007-0779 CVE-2007-0780 CVE-2007-0800
+  CVE-2007-0981 CVE-2007-0994 CVE-2007-0995 CVE-2007-0996 CVE-2007-1092]
 - works for me on x86_64
 
 Revision 1.176  2007/02/16 23:52:04  arekm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.219&r2=1.220&f=u

More information about the pld-cvs-commit mailing list