Author: qboosh Date: Sun Jan 16 08:25:47 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated BRs/Rs and noauto* (from mozilla-firefox.spec)
---- Files affected:
packages/iceweasel:
iceweasel.spec (1.119 -> 1.120)
---- Diffs:
================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.119
packages/iceweasel/iceweasel.spec:1.120
--- packages/iceweasel/iceweasel.spec:1.119 Sun Dec 12 09:47:00 2010
+++ packages/iceweasel/iceweasel.spec Sun Jan 16 09:25:42 2011
@@ -58,7 +58,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: automake
BuildRequires: bzip2-devel
-BuildRequires: cairo-devel >= 1.6.0
+BuildRequires: cairo-devel >= 1.8.8
BuildRequires: dbus-glib-devel >= 0.60
%{?with_gnomevfs:BuildRequires: gnome-vfs2-devel >= 2.0}
BuildRequires: gtk+2-devel >= 2:2.10
@@ -72,23 +72,25 @@
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libnotify-devel
BuildRequires: libpng(APNG)-devel >= 0.10
-BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: libpng-devel >= 1.2.17
BuildRequires: libstdc++-devel
-BuildRequires: nss-devel >= 1:3.12.3
-BuildRequires: pango-devel >= 1:1.6.0
+BuildRequires: nspr-devel >= 1:4.8.6
+BuildRequires: nss-devel >= 1:3.12.8
+BuildRequires: pango-devel >= 1:1.14.0
BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
BuildRequires: python-modules
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: sqlite3-devel >= 3.6.15
+BuildRequires: sqlite3-devel >= 3.7.2
BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXft-devel >= 2.1
+BuildRequires: xorg-lib-libXinerama-devel
+BuildRequires: xorg-lib-libXp-devel
BuildRequires: xorg-lib-libXt-devel
%if %{with xulrunner}
BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
-%else
-BuildRequires: nspr-devel >= 1:4.8.6
%endif
BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
@@ -97,13 +99,16 @@
%requires_eq_to xulrunner xulrunner-devel
%else
Requires: browser-plugins >= 2.0
-Requires: cairo >= 1.6.0
+Requires: cairo >= 1.8.8
+Requires: dbus-glib >= 0.60
Requires: gtk+2 >= 2:2.18
Requires: libpng(APNG) >= 0.10
Requires: myspell-common
Requires: nspr >= 1:4.8.6
-Requires: nss >= 1:3.12.3
+Requires: nss >= 1:3.12.8
+Requires: pango >= 1:1.14.0
Requires: sqlite3 >= %{sqlite_build_version}
+Requires: startup-notification >= 0.8
%endif
Provides: wwwbrowser
Obsoletes: mozilla-firebird
@@ -115,13 +120,10 @@
%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
-# iceweasel/icedove/iceape 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 libgtkembedmoz.so libmozjs.so
libxpcom.so libxul.so
+# don't satisfy other packages
+%define _noautoprovfiles %{_libdir}/%{name}
# and as we don't provide them, don't require either
-%define _noautoreq libgtkembedmoz.so libmozjs.so
libxpcom.so libxul.so
+%define _noautoreq libmozjs.so libxpcom.so libxul.so
libjemalloc.so
%if "%{cc_version}" >= "3.4"
%define specflags -fno-strict-aliasing
-fomit-frame-pointer -fno-tree-vrp -fno-stack-protector
@@ -343,7 +345,7 @@
rm -rf $HOME
EOF
-chmod a+rx $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
+chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
%clean
rm -rf $RPM_BUILD_ROOT
@@ -524,6 +526,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.120 2011/01/16 08:25:42 qboosh
+- updated BRs/Rs and noauto* (from mozilla-firefox.spec)
+
Revision 1.119 2010/12/12 08:47:00 arekm
- rel 2; fix patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.119&r2=1.120&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
