Author: glen Date: Tue Jan 9 22:51:10 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - move arch independant files to datadir - now creating noarch dictionaries, languages and extensions possible - rel 2 to denote the version for deps
---- Files affected: SPECS: mozilla-firefox.spec (1.167 -> 1.168) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.167 SPECS/mozilla-firefox.spec:1.168 --- SPECS/mozilla-firefox.spec:1.167 Tue Jan 9 16:04:47 2007 +++ SPECS/mozilla-firefox.spec Tue Jan 9 23:51:05 2007 @@ -14,7 +14,7 @@ Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 2.0.0.1 -Release: 0.9 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -199,13 +199,13 @@ CC="%{__cc}" \ CXX="%{__cxx}" - %install rm -rf $RPM_BUILD_ROOT cd mozilla install -d \ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ + $RPM_BUILD_ROOT%{_datadir}/%{name} \ $RPM_BUILD_ROOT{%{_includedir},%{_pkgconfigdir}} %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins @@ -215,12 +215,30 @@ MOZ_PKG_APPDIR=%{_libdir}/%{name} \ PKG_SKIP_STRIP=1 +# move arch independant ones to datadir +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res +mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins +ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome +ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults +ln -s ../../share/%{name}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries +ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions +ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs +ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons +ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d +ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res +ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins + sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png -#install -m644 bookmarks.html $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/profile/ -#install -m644 bookmarks.html $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/profile/US/ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} @@ -252,6 +270,9 @@ touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat +# what's this? it's content is invalid anyway. +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list + cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate #!/bin/sh umask 022 @@ -272,6 +293,15 @@ %clean rm -rf $RPM_BUILD_ROOT +%pre +for d in chrome defaults dictionaries extensions greprefs icons init.d res searchplugins; do + if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then + install -d %{_datadir}/%{name} + mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d + fi +done +exit 0 + %post %{_sbindir}/%{name}-chrome+xpcom-generate %update_browser_plugins @@ -291,50 +321,52 @@ %{_browserpluginsconfdir}/browsers.d/%{name}.* %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist -%{_libdir}/%{name}/res %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/*.js %{_libdir}/%{name}/components/*.xpt %dir %{_libdir}/%{name}/plugins %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so -%{_libdir}/%{name}/searchplugins -%{_libdir}/%{name}/icons -%{_libdir}/%{name}/defaults -%{_libdir}/%{name}/greprefs -%dir %{_libdir}/%{name}/extensions -%dir %{_libdir}/%{name}/dictionaries -%dir %{_libdir}/%{name}/init.d -%{_libdir}/%{name}/init.d/README %attr(755,root,root) %{_libdir}/%{name}/*.sh %attr(755,root,root) %{_libdir}/%{name}/m* %attr(755,root,root) %{_libdir}/%{name}/f* %attr(755,root,root) %{_libdir}/%{name}/regxpcom %attr(755,root,root) %{_libdir}/%{name}/x* %{_pixmapsdir}/* -%{_desktopdir}/* - -%dir %{_libdir}/%{name}/chrome -%{_libdir}/%{name}/chrome/*.jar -%{_libdir}/%{name}/chrome/*.manifest -%dir %{_libdir}/%{name}/chrome/icons -%{_libdir}/%{name}/chrome/icons/default - -# -dom-inspector subpackage? -%dir %{_libdir}/%{name}/extensions/[EMAIL PROTECTED] -%{_libdir}/%{name}/extensions/[EMAIL PROTECTED]/* +%{_desktopdir}/*.desktop -# the signature of the default theme -%dir %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +# symlinks +%{_libdir}/%{name}/chrome +%{_libdir}/%{name}/defaults +%{_libdir}/%{name}/dictionaries +%{_libdir}/%{name}/extensions +%{_libdir}/%{name}/greprefs +%{_libdir}/%{name}/icons +%{_libdir}/%{name}/init.d +%{_libdir}/%{name}/res +%{_libdir}/%{name}/searchplugins # browserconfig %{_libdir}/%{name}/browserconfig.properties %{_libdir}/%{name}/LICENSE %{_libdir}/%{name}/README.txt -%{_libdir}/%{name}/chrome/chromelist.txt -%{_libdir}/%{name}/dependentlibs.list + +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/chrome +%{_datadir}/%{name}/defaults +%{_datadir}/%{name}/dictionaries +%{_datadir}/%{name}/greprefs +%{_datadir}/%{name}/icons +%{_datadir}/%{name}/init.d +%{_datadir}/%{name}/res +%{_datadir}/%{name}/searchplugins + +%dir %{_datadir}/%{name}/extensions +# -dom-inspector subpackage? +%{_datadir}/%{name}/extensions/[EMAIL PROTECTED] +# the signature of the default theme +%{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} # files created by regxpcom and firefox -register %ghost %{_libdir}/%{name}/components/compreg.dat @@ -356,11 +388,11 @@ %files lang-en %defattr(644,root,root,755) -%{_libdir}/%{name}/chrome/en-US.jar -%{_libdir}/%{name}/chrome/en-US.manifest +%{_datadir}/%{name}/chrome/en-US.jar +%{_datadir}/%{name}/chrome/en-US.manifest # probably should share these with all mozilla apps -%{_libdir}/%{name}/dictionaries/en-US.aff -%{_libdir}/%{name}/dictionaries/en-US.dic +%{_datadir}/%{name}/dictionaries/en-US.aff +%{_datadir}/%{name}/dictionaries/en-US.dic %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -368,6 +400,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.168 2007/01/09 22:51:05 glen +- move arch independant files to datadir +- now creating noarch dictionaries, languages and extensions possible +- rel 2 to denote the version for deps + Revision 1.167 2007/01/09 15:04:47 glen - discard _firefoxdir macro ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.167&r2=1.168&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
