SPECS (DEVEL): mozilla-firefox.spec - dirty hack agains finding li...

[blekot]

Author: blekot                       Date: Sat Jan 14 14:23:40 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- dirty hack agains finding libs 
- empty extensions dir is nessery to run
- rel 2 (starting, working but it has problems with bookmarks from old FF)
- added all *.manifest, *.jar (I'm not sure if it's corect)
- STBR/test please

---- Files affected:
SPECS:
   mozilla-firefox.spec (1.95.2.10 -> 1.95.2.11) 

---- Diffs:

================================================================
Index: SPECS/mozilla-firefox.spec
diff -u SPECS/mozilla-firefox.spec:1.95.2.10 SPECS/mozilla-firefox.spec:1.95.2.11
--- SPECS/mozilla-firefox.spec:1.95.2.10	Fri Jan 13 19:27:13 2006
+++ SPECS/mozilla-firefox.spec	Sat Jan 14 15:23:35 2006
@@ -4,7 +4,10 @@
 # - 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
-#
+# BOOKMARKS issue:
+# - after upgrade menu bookmarks is empty (chgw why?)
+# - mange bookmakrs shows old bookmarks
+# - add any page will show your bookmarks in this session.
 # Conditional build:
 %bcond_with	tests	# enable tests (whatever they check)
 %bcond_without	gnome	# disable all GNOME components (gnomevfs, gnome, gnomeui)
@@ -13,7 +16,7 @@
 Summary(pl):	Mozilla Firefox - przeglądarka WWW
 Name:		mozilla-firefox
 Version:	1.5
-Release:	1.1
+Release:	2
 License:	MPL/LGPL
 Group:		X11/Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -159,9 +162,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
-	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \
+	$RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}{,extensions}} \
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}}
+# extensions dir is needed (it can be empty)
 	
 %{__make} -C xpinstall/packager \
 	MOZ_PKG_APPNAME="mozilla-firefox" \
@@ -193,6 +197,10 @@
 install dist/bin/xpt_dump $RPM_BUILD_ROOT%{_bindir}
 install dist/bin/xpt_link $RPM_BUILD_ROOT%{_bindir}
 
+# dirty hack agains finding libraries
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}/%{name}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}.conf
+
 ln -sf %{_includedir}/mozilla-firefox/necko/nsIURI.h \
 	$RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h
 	
@@ -241,9 +249,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 %{_sbindir}/firefox-chrome+xpcom-generate
 
 %postun
+/sbin/ldconfig
 if [ "$1" != "0" ]; then
 	%{_sbindir}/firefox-chrome+xpcom-generate
 fi
@@ -268,6 +278,8 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mozilla*
 %attr(755,root,root) %{_sbindir}/*
+# dirty hack agains libraries
+/etc/ld.so.conf.d/*.conf
 %dir %{_firefoxdir}
 %{_firefoxdir}/res
 %dir %{_firefoxdir}/components
@@ -279,6 +291,7 @@
 %{_firefoxdir}/icons
 %{_firefoxdir}/defaults
 %{_firefoxdir}/greprefs
+%dir %{_firefoxdir}/extensions
 %dir %{_firefoxdir}/init.d
 %attr(755,root,root) %{_firefoxdir}/*.so
 %attr(755,root,root) %{_firefoxdir}/*.sh
@@ -295,23 +308,13 @@
 %{_desktopdir}/*
 
 %dir %{_firefoxdir}/chrome
-%{_firefoxdir}/chrome/browser.jar
-%{_firefoxdir}/chrome/browser.manifest
+%{_firefoxdir}/chrome/*.jar
+%{_firefoxdir}/chrome/*.manifest
 # -chat subpackage?
 #%{_firefoxdir}/chrome/chatzilla.jar
-%{_firefoxdir}/chrome/classic.jar
-%{_firefoxdir}/chrome/classic.manifest
-%{_firefoxdir}/chrome/comm.jar
-%{_firefoxdir}/chrome/comm.manifest
 #%{_firefoxdir}/chrome/content-packs.jar
-%{_firefoxdir}/chrome/help.jar
 # -dom-inspector subpackage?
 #%{_firefoxdir}/chrome/inspector.jar
-%{_firefoxdir}/chrome/modern.jar
-%{_firefoxdir}/chrome/pippki.jar
-%{_firefoxdir}/chrome/pippki.manifest
-%{_firefoxdir}/chrome/toolkit.jar
-%{_firefoxdir}/chrome/toolkit.manifest
 %{_firefoxdir}/chrome/mozilla-firefox-misc-installed-chrome.txt
 %dir %{_firefoxdir}/chrome/icons
 %{_firefoxdir}/chrome/icons/default
@@ -337,6 +340,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.11  2006/01/14 14:23:35  blekot
+- dirty hack agains finding libs
+- empty extensions dir is nessery to run
+- rel 2 (starting, working but it has problems with bookmarks from old FF)
+- added all *.manifest, *.jar (I'm not sure if it's corect)
+- STBR/test please
+
 Revision 1.95.2.10  2006/01/13 18:27:13  megabajt
 - added manifest files
 
================================================================

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