packages: mozilla-firefox-bin/mozilla-firefox-bin.spec - package crashrepor...

[glen]

Author: glen                         Date: Wed Aug 18 08:38:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package crashreporter, drop updater, reorganize files section
- rel 2

---- Files affected:
packages/mozilla-firefox-bin:
   mozilla-firefox-bin.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec
diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.67 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.68
--- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.67	Wed Aug 18 10:12:38 2010
+++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec	Wed Aug 18 10:38:46 2010
@@ -1,19 +1,10 @@
 # $Revision$, $Date$
-# TODO
-#   /usr/lib/mozilla-firefox-bin/crashreporter
-#   /usr/lib/mozilla-firefox-bin/crashreporter-override.ini
-#   /usr/lib/mozilla-firefox-bin/crashreporter.ini
-
-#   /usr/lib/mozilla-firefox-bin/Throbber-small.gif
-#   /usr/lib/mozilla-firefox-bin/update.locale
-#   /usr/lib/mozilla-firefox-bin/updater
-#   /usr/lib/mozilla-firefox-bin/updater.ini
 %define		realname	firefox
 Summary:	Mozilla Firefox web browser
 Summary(pl.UTF-8):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox-bin
 Version:	3.6.8
-Release:	0.7
+Release:	2
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2
@@ -100,6 +91,12 @@
 # mozldap
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
 
+# remove update notifier, we prefer rpm packages for updating
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/update.locale
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif
+
 # remove unecessary stuff
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
@@ -137,9 +134,23 @@
 
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/blocklist.xml
+%{_libdir}/%{name}/browserconfig.properties
+%{_libdir}/%{name}/platform.ini
+%attr(755,root,root) %{_libdir}/%{name}/firefox
+%attr(755,root,root) %{_libdir}/%{name}/firefox-bin
+%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
+%attr(755,root,root) %{_libdir}/%{name}/plugin-container
+
+%{_libdir}/%{name}/chrome
+%{_libdir}/%{name}/defaults
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/greprefs
+%{_libdir}/%{name}/icons
+%{_libdir}/%{name}/modules
 %{_libdir}/%{name}/res
+%{_libdir}/%{name}/searchplugins
+
 %dir %{_libdir}/%{name}/extensions
 # the signature of the default theme
 %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
@@ -148,20 +159,17 @@
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %{_libdir}/%{name}/components/*.js
 %{_libdir}/%{name}/components/*.xpt
-%{_libdir}/%{name}/chrome
-%{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/greprefs
-%{_libdir}/%{name}/icons
+
 %dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so
-%{_libdir}/%{name}/searchplugins
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/browserconfig.properties
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/plugin-container
-%attr(755,root,root) %{_libdir}/%{name}/m*
-%attr(755,root,root) %{_libdir}/%{name}/f*
+
+# crashreporter
+%attr(755,root,root) %{_libdir}/%{name}/crashreporter
+%{_libdir}/%{name}/crashreporter-override.ini
+%{_libdir}/%{name}/crashreporter.ini
+
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/%{name}.desktop
 
@@ -171,6 +179,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2010/08/18 08:38:46  glen
+- package crashreporter, drop updater, reorganize files section
+- rel 2
+
 Revision 1.67  2010/08/18 08:12:38  glen
 - package initial blocklist.xml
 - see: http://kb.mozillazine.org/Blocklist.xml
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.67&r2=1.68&f=u