SPECS (AC-branch): xulrunner.spec - merge from HEAD update to 1.8....

[glen]

Author: glen                         Date: Sun Mar 30 12:35:36 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge from HEAD update to 1.8.1.13, fixes CVE-2008-1233, CVE-2008-1234, CVE-2008-1235,
  CVE-2008-1236, CVE-2008-1237, CVE-2008-1238, CVE-2007-4879,
  CVE-2008-1195, CVE-2008-1240, CVE-2008-1241

---- Files affected:
SPECS:
   xulrunner.spec (1.37.2.6 -> 1.37.2.7) 

---- Diffs:

================================================================
Index: SPECS/xulrunner.spec
diff -u SPECS/xulrunner.spec:1.37.2.6 SPECS/xulrunner.spec:1.37.2.7
--- SPECS/xulrunner.spec:1.37.2.6	Sun Mar 30 14:33:14 2008
+++ SPECS/xulrunner.spec	Sun Mar 30 14:35:31 2008
@@ -4,18 +4,18 @@
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
 #
-%define		_snap	20080208
+%define		_snap	20080326
 %define		_rel	1
 #
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	1.8.1.12
+Version:	1.8.1.13
 Release:	1.%{_snap}.%{_rel}
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications
 Source0:	%{name}-%{version}-%{_snap}-source.tar.bz2
-# Source0-md5:	337045388251dedf19f55ba1d8b64c92
+# Source0-md5:	24ac70198d4267d1bf83dd022ff0c7e5
 Patch0:		%{name}-ldap-with-nss.patch
 Patch1:		%{name}-install.patch
 Patch2:		%{name}-pc.patch
@@ -37,7 +37,7 @@
 BuildRequires:	libjpeg-devel >= 6b
 BuildRequires:	libpng-devel >= 1.2.7
 BuildRequires:	libstdc++-devel
-BuildRequires:	nspr-devel >= 1:4.6.3
+BuildRequires:	nspr-devel >= 1:4.6.4
 BuildRequires:	nss-devel >= 1:3.11.3-3
 BuildRequires:	pango-devel >= 1:1.6.0
 BuildRequires:	perl-modules >= 5.004
@@ -56,8 +56,10 @@
 
 %define		specflags	-fno-strict-aliasing
 
-# mozilla, seamonkey and firefox provide their own versions
-%define		_noautoreqdep	libgtkembedmoz.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxpcom.so
+# we don't want these to satisfy xulrunner-devel [???]
+%define		_noautoprov	libmozjs.so libxpcom.so
+# no need to require them (we have strict deps for these)
+%define		_noautoreq	libgtkembedmoz.so libldap50.so libmozjs.so libprldap50.so libssldap50.so libxpcom.so libxul.so
 
 %description
 XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -209,7 +211,7 @@
 	PKG_SKIP_STRIP=1
 
 install -d \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/components \
+	$RPM_BUILD_ROOT%{_datadir}/{idl/xulrunner,%{name}/components} \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir}} \
 	$RPM_BUILD_ROOT{%{_pkgconfigdir},%{_includedir}}
 
@@ -229,7 +231,7 @@
 
 # header/development files
 cp -rfLp dist/include	$RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -rfLp dist/idl	$RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -rfLp dist/idl/*	$RPM_BUILD_ROOT%{_datadir}/idl/xulrunner
 cp -rfLp dist/public/ldap{,-private} $RPM_BUILD_ROOT%{_includedir}/%{name}
 install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl $RPM_BUILD_ROOT%{_bindir}/xpidl
@@ -477,6 +479,7 @@
 %attr(755,root,root) %{_bindir}/xulrunner-config
 %attr(755,root,root) %{_libdir}/%{name}/xulrunner-stub
 %{_includedir}/%{name}
+%{_datadir}/idl/%{name}
 %{_pkgconfigdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -485,6 +488,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37.2.7  2008-03-30 12:35:31  glen
+- merge from HEAD update to 1.8.1.13, fixes CVE-2008-1233, CVE-2008-1234, CVE-2008-1235,
+  CVE-2008-1236, CVE-2008-1237, CVE-2008-1238, CVE-2007-4879,
+  CVE-2008-1195, CVE-2008-1240, CVE-2008-1241
+
 Revision 1.37.2.6  2008-03-30 12:33:14  glen
 - save changes (old)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xulrunner.spec?r1=1.37.2.6&r2=1.37.2.7&f=u