SPECS: mozilla-firefox.spec - 3.0 - NFY (packaging needs to be fixed)
Bartosz Świątek
shadzik w gmail.com
Wto, 17 Cze 2008, 19:03:29 CEST
2008/6/17 patrys <patrys w pld-linux.org>:
> Author: patrys Date: Tue Jun 17 16:57:04 2008 GMT
> Module: SPECS Tag: HEAD
> ---- Log message:
> - 3.0
> - NFY (packaging needs to be fixed)
>
> ---- Files affected:
> SPECS:
> mozilla-firefox.spec (1.237 -> 1.238)
>
> ---- Diffs:
>
> ================================================================
> Index: SPECS/mozilla-firefox.spec
> diff -u SPECS/mozilla-firefox.spec:1.237 SPECS/mozilla-firefox.spec:1.238
> --- SPECS/mozilla-firefox.spec:1.237 Sat May 24 21:03:18 2008
> +++ SPECS/mozilla-firefox.spec Tue Jun 17 18:56:58 2008
> @@ -15,30 +15,29 @@
> %undefine with_gnomeui
> %undefine with_gnomevfs
> %endif
> -%define firefox_ver 2.0.0.14
> +%define firefox_ver 3.0
> #
> Summary: Firefox Community Edition web browser
> Summary(pl.UTF-8): Firefox Community Edition - przeglądarka WWW
> Name: mozilla-firefox
> Version: %{firefox_ver}
> -Release: 2
> +Release: 0.1
> License: MPL 1.1 or GPL v2+ or LGPL v2.1+
> Group: X11/Applications/Networking
> Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
> -# Source0-md5: 9e9c13ba7b81f93f2fa10c6f256ee31e
> +# Source0-md5: 4210ae0801df2eb498408533010d97c1
> Source1: %{name}.desktop
> Source2: %{name}.sh
> Patch0: mozilla-install.patch
> Patch1: %{name}-lib_path.patch
> -Patch2: %{name}-fonts.patch
> -Patch3: %{name}-myspell.patch
> -Patch4: %{name}-pango-cursor-position.patch
> -Patch5: %{name}-pango-ligatures.patch
> -Patch6: %{name}-pango-cursor-position-more.patch
> -Patch7: %{name}-pango-justified-range.patch
> -Patch8: %{name}-pango-printing.patch
> -Patch9: %{name}-pango-underline.patch
> -Patch10: %{name}-xft-randewidth.patch
> +#Patch3: %{name}-myspell.patch
> +#Patch4: %{name}-pango-cursor-position.patch
> +#Patch5: %{name}-pango-ligatures.patch
> +#Patch6: %{name}-pango-cursor-position-more.patch
> +#Patch7: %{name}-pango-justified-range.patch
> +#Patch8: %{name}-pango-printing.patch
> +#Patch9: %{name}-pango-underline.patch
> +#Patch10: %{name}-xft-randewidth.patch
> Patch11: %{name}-ti-agent.patch
> Patch12: %{name}-agent.patch
> # if ac rebuild is needed...
> @@ -105,15 +104,14 @@
> cd mozilla
> %patch0 -p1
> %patch1 -p1
> -%patch2 -p1
> -%patch3 -p1
> -%patch4 -p1
> -%patch5 -p1
> -%patch6 -p1
> -%patch7 -p1
> -%patch8 -p0
> -%patch9 -p1
> -%patch10 -p1
> +#%patch3 -p1
> +#%patch4 -p1
> +#%patch5 -p1
> +#%patch6 -p1
> +#%patch7 -p1
> +#%patch8 -p0
> +#%patch9 -p1
> +#%patch10 -p1
> %if "%{pld_release}" == "ti"
> %patch11 -p1
> %else
> @@ -125,7 +123,7 @@
>
> cp -f %{_datadir}/automake/config.* build/autoconf
> cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
> -cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
> +#cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
>
> cat << 'EOF' > .mozconfig
> . $topsrcdir/browser/config/mozconfig
> @@ -174,15 +172,12 @@
> %else
> ac_add_options --disable-gnomevfs
> %endif
> -ac_add_options --disable-freetype2
> ac_add_options --disable-installer
> ac_add_options --disable-javaxpcom
> ac_add_options --disable-updater
> -ac_add_options --enable-default-toolkit=gtk2
> ac_add_options --enable-svg
> ac_add_options --enable-system-cairo
> ac_add_options --enable-system-myspell
> -ac_add_options --enable-xft
> ac_add_options --with-distribution-id=org.pld-linux
> ac_add_options --with-system-jpeg
> ac_add_options --with-system-nspr
> @@ -199,17 +194,21 @@
> %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}
>
> -%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
> -
> -%{__make} -C obj-%{_target_cpu}/xpinstall/packager stage-package \
> +cd obj-%{_target_cpu}
> +[ -d dist/firefox ] || mkdir dist/firefox
> +%{__make} install \
> DESTDIR=$RPM_BUILD_ROOT \
> MOZ_PKG_APPDIR=%{_libdir}/%{name} \
> PKG_SKIP_STRIP=1
> +cd ..
> +
> +%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
>
> # move arch independant ones to datadir
> mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
> @@ -217,7 +216,6 @@
> 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
> @@ -225,7 +223,6 @@
> 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
>
> @@ -233,17 +230,12 @@
> ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
>
> sed 's, w LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
> -ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
> +#ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
>
> install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
>
> install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
>
> -# header/development files
> -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
> -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump
> -rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link
> -
> # files created by regxpcom and firefox -register
> touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
> touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
> @@ -276,7 +268,7 @@
> if [ -d %{_libdir}/%{name}/dictionaries ] && [ ! -L %{_libdir}/%{name}/dictionaries ]; then
> mv -v %{_libdir}/%{name}/dictionaries{,.rpmsave}
> fi
> -for d in chrome defaults extensions greprefs icons init.d res searchplugins; do
> +for d in chrome defaults extensions greprefs icons res searchplugins; do
> if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
> install -d %{_datadir}/%{name}
> mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
> @@ -556,7 +548,6 @@
> %{_libdir}/%{name}/extensions
> %{_libdir}/%{name}/greprefs
> %{_libdir}/%{name}/icons
> -%{_libdir}/%{name}/init.d
> %{_libdir}/%{name}/res
> %{_libdir}/%{name}/searchplugins
>
> @@ -571,7 +562,6 @@
> %{_datadir}/%{name}/defaults
> %{_datadir}/%{name}/greprefs
> %{_datadir}/%{name}/icons
> -%{_datadir}/%{name}/init.d
> %{_datadir}/%{name}/res
> %{_datadir}/%{name}/searchplugins
>
> @@ -591,7 +581,11 @@
> All persons listed below can be reached at <cvs_login>@pld-linux.org
>
> $Log$
> -Revision 1.237 2008/05/24 19:03:18 hawk
> +Revision 1.238 2008/06/17 16:56:58 patrys
> +- 3.0
> +- NFY (packaging needs to be fixed)
> +
> +Revision 1.237 2008-05-24 19:03:18 hawk
> - use %pld_release macro and apply proper agent patch, BR: rpm >= 4.4.9-56
>
> Revision 1.236 2008-04-24 06:25:35 hawk
> ================================================================
>
> ---- CVS-web:
> http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mozilla-firefox.spec?r1=1.237&r2=1.238&f=u
>
Możesz powiedzieć po co robisz burdel?
Na DEVEL jest już 3.0 w lepszej wersji niż Ty to tu prezentujesz,
wystarczy mergenąć.
Więcej informacji o liście dyskusyjnej pld-devel-pl