Author: czarny Date: Thu Oct 26 16:20:27 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - name patches - sorted patches - firefox->icewaesel names/dirs - files updated - builds, but fails to start
---- Files affected: SPECS: iceweasel.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/iceweasel.spec diff -u SPECS/iceweasel.spec:1.6 SPECS/iceweasel.spec:1.7 --- SPECS/iceweasel.spec:1.6 Mon Oct 16 09:42:46 2006 +++ SPECS/iceweasel.spec Thu Oct 26 18:20:22 2006 @@ -20,7 +20,7 @@ %bcond_with tests # enable tests (whatever they check) %bcond_without gnome # disable all GNOME components (gnomevfs, gnome, gnomeui) # -%define _rc g1 +%define _rc g2 %define _rel 0.2 Summary: Iceweasel web browser Summary(pl): Iceweasel - przeglądarka WWW @@ -30,19 +30,18 @@ License: MPL/LGPL Group: X11/Applications/Networking Source0: http://gnuzilla.gnu.org/download/%{name}-%{version}-%{_rc}.tar.bz2 -# Source0-md5: 4bb1f1ac5a52662239a1d5ced177493d +# Source0-md5: b9c3f12733132f6d35cd35ee1a7d5e07 Source1: %{name}.desktop Source2: %{name}.sh -Patch0: %{name}-nss.patch -Patch1: mozilla-firefox-lib_path.patch -Patch2: mozilla-firefox-nss-system-nspr.patch -Patch3: mozilla-firefox-nopangoxft.patch -#Patch4: mozilla-firefox-name.patch -Patch5: mozilla-firefox-fonts.patch -Patch6: %{name}-build.patch -Patch7: %{name}-stack.patch -# UPDATE or DROP? -#PatchX: %{name}-searchplugins.patch +Patch0: %{name}-autoconf.patch +Patch1: %{name}-build.patch +Patch2: mozilla-firefox-fonts.patch +Patch3: %{name}-lib_path.patch +Patch4: mozilla-firefox-nss-system-nspr.patch +Patch5: mozilla-firefox-nopangoxft.patch +Patch6: %{name}-name.patch +Patch7: %{name}-nss.patch +Patch8: %{name}-stack.patch URL: http://www.gnu.org/software/gnuzilla/ %{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: automake @@ -162,14 +161,15 @@ %prep %setup -q -n %{name}-%{version}-%{_rc} -%patch0 -p1 -%patch1 -p1 +%patch0 -p0 +%patch1 -p0 %patch2 -p1 %patch3 -p1 -#%patch4 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p0 -%patch7 -p1 +#%patch7 -p1 +#%patch8 -p1 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure @@ -186,7 +186,7 @@ cat << 'EOF' > .mozconfig # That is evili, as we don't build default mozilla -#. $topsrcdir/browser/config/mozconfig +. $topsrcdir/browser/config/mozconfig ac_add_options --prefix=%{_prefix} ac_add_options --exec-prefix=%{_exec_prefix} @@ -265,6 +265,9 @@ ac_cv_visibility_pragma=no EOF +# configure.in defines MOZ_APP_NAME as iceweasel, wheres configure is old and defines it as firefox +#%{__aclocal} +#%{__autoconf} %configure2_13 %{__make} @@ -306,6 +309,7 @@ # $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h # CA certificates +rm $RPM_BUILD_ROOT%{_iceweaseldir}/libnssckbi.so ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_iceweaseldir}/libnssckbi.so # pkgconfig files @@ -315,14 +319,14 @@ done # already provided by standalone packages -rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc +rm -f $RPM_BUILD_ROOT%{_pkgconfigdir}/iceweasel-{nss,nspr}.pc sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \ $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc # includedir/dom CFLAGS sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \ - $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc + $RPM_BUILD_ROOT%{_pkgconfigdir}/iceweasel-plugin.pc cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate #!/bin/sh @@ -343,7 +347,7 @@ unset TMPDIR TMP || : export HOME=$(mktemp -d) MOZILLA_FIVE_HOME=%{_iceweaseldir} %{_iceweaseldir}/regxpcom -MOZILLA_FIVE_HOME=%{_iceweaseldir} %{_iceweaseldir}/firefox -register +MOZILLA_FIVE_HOME=%{_iceweaseldir} %{_iceweaseldir}/iceweasel -register rm -rf $HOME EOF @@ -383,10 +387,10 @@ %attr(755,root,root) %{_iceweaseldir}/*.so %attr(755,root,root) %{_iceweaseldir}/*.sh %attr(755,root,root) %{_iceweaseldir}/m* -%attr(755,root,root) %{_iceweaseldir}/f* +%attr(755,root,root) %{_iceweaseldir}/i* %attr(755,root,root) %{_iceweaseldir}/reg* %attr(755,root,root) %{_iceweaseldir}/x* -%{_pixmapsdir}/* +#%{_pixmapsdir}/* %{_desktopdir}/* %dir %{_iceweaseldir}/chrome @@ -395,8 +399,8 @@ # -chat subpackage? #%{_iceweaseldir}/chrome/chatzilla.jar #%{_iceweaseldir}/chrome/content-packs.jar -%dir %{_iceweaseldir}/chrome/icons -%{_iceweaseldir}/chrome/icons/default +#%dir %{_iceweaseldir}/chrome/icons +#%{_iceweaseldir}/chrome/icons/default # -dom-inspector subpackage? %dir %{_iceweaseldir}/extensions/[EMAIL PROTECTED] @@ -422,6 +426,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2006/10/26 16:20:22 czarny +- name patches +- sorted patches +- firefox->icewaesel names/dirs +- files updated +- builds, but fails to start + Revision 1.6 2006/10/16 07:42:46 glen - fix source0; cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/iceweasel.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
