On Apr 20, 2008, at 4:02 PM, Brian Lu wrote:
>
> -./configure
> +#Build in a separated directory
> +SRCDIR=$PWD
> +export MOZCONFIG=$PWD/.mozconfig
> +mkdir -p ../obj
> +cd ../obj
> +
> +${SRCDIR}/configure
> make
>
Is building in a separated directory required?
> cd browser/installer
> @@ -245,16 +256,30 @@
>
> %install
> /bin/rm -rf $RPM_BUILD_ROOT
> +#install here
What's the meaning of "install here"?
>
> +
> +mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
> +mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
> +mkdir -p $RPM_BUILD_ROOT%{_datadir}/idl/%{name}
> +mkdir -p $RPM_BUILD_ROOT/tmp
> +
> +LIBDIR=$RPM_BUILD_ROOT%{_libdir}/%{name}
> +INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir}/%{name}
> +IDLDIR=$RPM_BUILD_ROOT%{_datadir}/idl/%{name}
> +
> +BUILDDIR=$PWD/../obj
I don't like it at all.
>
> +cd $RPM_BUILD_ROOT/tmp
Why not use $BUILDDIR/dist?
>
> +bzip2 -dc $BUILDDIR/dist/firefox-*.sdk.tar.bz2 | tar -xf -
> +
> +cd firefox*
> +mv bin/* ${LIBDIR}
> +touch ${LIBDIR}/.autoreg
>
> +
> +mv include/* ${INCLUDEDIR}
> +mv idl/* ${IDLDIR}
>
> -DESTDIR=$RPM_BUILD_ROOT \
> - make install
> -/bin/rm -rf $RPM_BUILD_ROOT%{_libdir}/*
> -#/bin/rm -rf $RPM_BUILD_ROOT%{_bindir}/*
> -/bin/rm -rf $RPM_BUILD_ROOT%{_bindir}
> -BUILDDIR=`pwd`
> -cd $RPM_BUILD_ROOT%{_libdir}
> -bzip2 -dc $BUILDDIR/dist/firefox-*.tar.bz2 | tar -xf -
> -mv firefox firefox3
> +cd ${LIBDIR}
> +rm -rf $RPM_BUILD_ROOT/tmp
>
> # Don't deliver nss, nspr header files on Solaris
> %ifos linux
> @@ -264,7 +289,7 @@
> /usr/bin/find security/nss/lib/ -name '*.h' -type f -exec /bin/cp {} \
> $RPM_BUILD_ROOT/%{_includedir}/firefox/nss/ \;
> %else
> -find $RPM_BUILD_ROOT/%{_includedir} -name "nss*" -o -name "nspr*" \
> +$RPM_BUILD_ROOT/%{_libdir}/%{name}/include \( -name "nss*" -o -
> name "nspr*" \
> -type f | xargs rm -f
> %endif
>
> @@ -279,7 +304,6 @@
> install -c -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/firefox.1
> %endif
>
> -/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/firefox
> #/bin/ln -s ../lib/firefox/firefox $RPM_BUILD_ROOT%{_bindir}/firefox
>
> # install preloaded library list that would be picked up by
> gdmprefetch
> @@ -315,6 +339,18 @@
> # install firefox.cfg
> install -c -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_ffdir}/firefox.cfg
>
> +# install firefox-xpcom.pc
> +mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
> +
> +/usr/bin/sed -e "s,BASEDIR,%{_basedir},g" \
> + -e "s,LIBDIR,%{_libdir},g" \
> + -e "s,DATADIR,%{_datadir},g"\
> + -e "s,INCLUDEDIR,%{_includedir},g" \
> + -e "s,NAME,%{name},g" \
> + %{SOURCE9} > /tmp/%{name}-xpcom.pc
> +install -c -m 644 /tmp/%{name}-xpcom.pc \
> + $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-xpcom.pc
> +
Do you want to use /tmp ?
Ginn
--------
Ginn Chen
Software Engineer, Browser Team
Sun Microsystems, Inc.
Phone: x82869 / +86-10-62673869
Fax: +86-10-62780969
