SPECS (AC-branch): mozilla-firefox.spec - pretrans is a proper pla...

[glen]

Author: glen                         Date: Mon Apr  9 20:27:04 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- pretrans is a proper place for replacing dirs/symlinks
- don't satisfy deps for xulrunner-devel
- rel 3

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.160.2.15 -> 1.160.2.16) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.160.2.15 SPECS/mozilla-firefox.spec:1.160.2.16
--- SPECS/mozilla-firefox.spec:1.160.2.15	Wed Mar 21 11:52:32 2007
+++ SPECS/mozilla-firefox.spec	Mon Apr  9 22:26:59 2007
@@ -13,7 +13,7 @@
 Summary(pl):	Firefox Community Edition - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	2.0.0.3
-Release:	1
+Release:	3
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -64,6 +64,10 @@
 # mozilla and firefox provide their own versions
 %define		_noautoreqdep		libgkgfx.so libgtkembedmoz.so libgtkxtbin.so libjsj.so libmozjs.so libxpcom.so libxpcom_compat.so libxpcom_core.so
 %define		_noautoprovfiles	%{_libdir}/%{name}/components
+# we don't want these to satisfy xulrunner-devel
+%define		_noautoprov			libmozjs.so libxpcom.so libxul.so
+# and as we don't provide them, don't require either
+%define		_noautoreq			libmozjs.so libxpcom.so libxul.so
 
 %define		specflags	-fno-strict-aliasing
 
@@ -263,7 +267,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pretrans
 if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
 	mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
 fi
@@ -361,6 +365,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160.2.16  2007/04/09 20:26:59  glen
+- pretrans is a proper place for replacing dirs/symlinks
+- don't satisfy deps for xulrunner-devel
+- rel 3
+
 Revision 1.160.2.15  2007/03/21 10:52:32  mguevara
 - 2.0.0.3-1, fixes security issue MFSA 2007-11 - FTP PASV port-scanning
 
================================================================

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