Author: glen Date: Thu Sep 21 11:36:15 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - packages on AC
---- Files affected: SPECS: swiftfox.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/swiftfox.spec diff -u SPECS/swiftfox.spec:1.5 SPECS/swiftfox.spec:1.6 --- SPECS/swiftfox.spec:1.5 Thu Sep 21 12:32:22 2006 +++ SPECS/swiftfox.spec Thu Sep 21 13:36:10 2006 @@ -208,16 +208,14 @@ $RPM_BUILD_ROOT{%{_includedir}/%{name}/idl,%{_pkgconfigdir}} # extensions dir is needed (it can be empty) -ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox - %{__make} -C xpinstall/packager \ - MOZ_PKG_APPNAME="mozilla-firefox" \ - MOZILLA_BIN="\$(DIST)/bin/firefox-bin" \ + MOZ_PKG_APPNAME="%{name}" \ + MOZILLA_BIN='$(DIST)/bin/%{name}-bin' \ EXCLUDE_NSPR_LIBS=1 sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/mozilla-firefox-*linux*.tar.gz +tar -xvz -C $RPM_BUILD_ROOT%{_libdir} -f dist/%{name}-*linux*.tar.gz install other-licenses/branding/firefox/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png #install -m0644 bookmarks.html $RPM_BUILD_ROOT%{_firefoxdir}/defaults/profile/ @@ -252,17 +250,19 @@ PATH=%{_firefoxdir}:$PATH export PATH -# added /usr/lib : don't load your local library +# added %{_prefix}/lib : don't load your local library LD_LIBRARY_PATH=%{_firefoxdir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH unset TMPDIR TMP || : export HOME=$(mktemp -d) MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/regxpcom -MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/firefox -register +MOZILLA_FIVE_HOME=%{_firefoxdir} %{_firefoxdir}/%{name} -register rm -rf $HOME EOF +mv $RPM_BUILD_ROOT%{_bindir}/{mozilla-firefox,swiftfox} + %clean rm -rf $RPM_BUILD_ROOT @@ -324,7 +324,7 @@ %attr(755,root,root) %{_bindir}/xpt_dump %attr(755,root,root) %{_bindir}/xpt_link %{_includedir}/%{name} -%{_pkgconfigdir}/* +#%{_pkgconfigdir}/* %files lang-en %defattr(644,root,root,755) @@ -337,6 +337,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/09/21 11:36:10 glen +- packages on AC + Revision 1.5 2006/09/21 10:32:22 glen - some fixes, not complete ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/swiftfox.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit