SPECS: mozilla-firefox.spec - CAN-2005-2871; rel 4

[glen]

Author: glen                         Date: Wed Sep 21 10:15:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- CAN-2005-2871; rel 4

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.96 -> 1.97) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.96 SPECS/mozilla-firefox.spec:1.97
--- SPECS/mozilla-firefox.spec:1.96	Sat Sep 10 10:46:04 2005
+++ SPECS/mozilla-firefox.spec	Wed Sep 21 12:15:09 2005
@@ -4,6 +4,18 @@
 # - handle locales differently (runtime, since it's possible to do)
 # - see ftp://ftp.debian.org/debian/pool/main/m/mozilla-firefox/*diff*
 #   for hints how to make locales and other stuff like extensions working
+# - unpackaged files check
+#   /usr/lib/mozilla-firefox/LICENSE
+#   /usr/lib/mozilla-firefox/README.txt
+#   /usr/lib/mozilla-firefox/browserconfig.properties
+#   /usr/lib/mozilla-firefox/chrome/chatzilla.jar
+#   /usr/lib/mozilla-firefox/chrome/chromelist.txt
+#   /usr/lib/mozilla-firefox/chrome/content-packs.jar
+#   /usr/lib/mozilla-firefox/chrome/embed-sample.jar
+#   /usr/lib/mozilla-firefox/chrome/installed-chrome.txt
+#   /usr/lib/mozilla-firefox/components/myspell/en-US.aff
+#   /usr/lib/mozilla-firefox/components/myspell/en-US.dic
+#   /usr/lib/mozilla-firefox/init.d/README
 #
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
@@ -13,7 +25,7 @@
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	1.0.6
-Release:	3
+Release:	4
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -27,6 +39,7 @@
 Patch4:		%{name}-freetype.patch
 Patch5:		%{name}-searchplugins.patch
 Patch6:		%{name}-gcc-bugs.patch
+Patch7:		%{name}-1.0.6-GLSA105396.patch
 URL:		http://www.mozilla.org/projects/firefox/
 BuildRequires:	automake
 %if %{with ft218}
@@ -103,7 +116,8 @@
 Anglojęzyczne zasoby dla Mozilla-FireFox
 
 %prep
-%setup -q -n mozilla
+%setup -q -c
+cd mozilla
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -111,9 +125,11 @@
 %{?with_ft218:%patch4 -p1}
 %patch5 -p0
 %patch6 -p0
+%patch7 -p1
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
 
 %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`"
 export MOZ_PHOENIX="1"
@@ -166,6 +182,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd mozilla
 install -d \
 	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
@@ -342,6 +359,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.97  2005/09/21 10:15:09  glen
+- CAN-2005-2871; rel 4
+
 Revision 1.96  2005/09/10 08:46:04  radek
 - release 3: --enable-extensions=default, all doesn't seem work properly
 
================================================================

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