SPECS (AC-branch): mozilla-firefox.spec - HEAD merge; rel 1

[glen]

Author: glen                         Date: Fri Dec 22 15:29:39 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge; rel 1

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.160.2.2 -> 1.160.2.3) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.160.2.2 SPECS/mozilla-firefox.spec:1.160.2.3
--- SPECS/mozilla-firefox.spec:1.160.2.2	Fri Dec 22 15:20:36 2006
+++ SPECS/mozilla-firefox.spec	Fri Dec 22 16:29:34 2006
@@ -14,7 +14,7 @@
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	2.0.0.1
-Release:	0.1
+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
@@ -73,13 +73,16 @@
 
 %package libs
 Summary:	Mozilla Firefox shared libraries
-Summary(pl):	Biblioteki współdzielone Mozilla Firefox
+Summary(pl):	Biblioteki współdzielone przeglądarki Mozilla Firefox
 Group:		Libraries
-Conflicts:	%{name} < 2.0-1.4
+Conflicts:	mozilla-firefox < 2.0-1.4
 
 %description libs
 Mozilla Firefox shared libraries.
 
+%description libs -l pl
+Biblioteki współdzielone przeglądarki Mozilla Firefox.
+
 %package devel
 Summary:	Headers for developing programs that will use Mozilla Firefox
 Summary(pl):	Mozilla Firefox - pliki nagłówkowe
@@ -99,8 +102,6 @@
 Summary:	English resources for Mozilla Firefox
 Summary(pl):	Anglojęzyczne zasoby dla przeglądarki Mozilla Firefox
 Group:		X11/Applications/Networking
-Requires(post,postun):	%{name} = %{version}-%{release}
-Requires(post,postun):	textutils
 Requires:	%{name} = %{version}-%{release}
 Provides:	%{name}-lang-resources = %{version}-%{release}
 
@@ -215,7 +216,7 @@
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-# header/developement files
+# header/development files
 cp -rfL dist/include	$RPM_BUILD_ROOT%{_includedir}/%{name}
 cp -rfL dist/idl	$RPM_BUILD_ROOT%{_includedir}/%{name}
 ln -sf necko/nsIURI.h $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
@@ -349,8 +350,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160.2.3  2006/12/22 15:29:34  glen
+- HEAD merge; rel 1
+
 Revision 1.160.2.2  2006/12/22 14:20:36  prism
 - updated to 2.0.0.1, builds'n'works for me.
+  (fixes CVE-2006-6497 CVE-2006-6498 CVE-2006-6499 CVE-2006-6500 CVE-2006-6501
+  CVE-2006-6502 CVE-2006-6503 CVE-2006-6504 CVE-2006-6506 CVE-2006-6507)
 
 Revision 1.160.2.1  2006/12/06 00:09:08  glen
 - AC-branch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.160.2.2&r2=1.160.2.3&f=u