Author: baggins Date: Mon Jun 4 17:24:14 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated from seamonkey.spec, rev 1.110
---- Files affected:
packages/iceape:
iceape.spec (1.39 -> 1.40)
---- Diffs:
================================================================
Index: packages/iceape/iceape.spec
diff -u packages/iceape/iceape.spec:1.39 packages/iceape/iceape.spec:1.40
--- packages/iceape/iceape.spec:1.39 Mon Jun 4 17:30:28 2012
+++ packages/iceape/iceape.spec Mon Jun 4 19:24:09 2012
@@ -1,14 +1,29 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_with gnomeui # enable GnomeUI
+%bcond_without enigmail # don't build enigmail - GPG/PGP support
+%bcond_without gnomeui # disable gnomeui support
%bcond_without gnome # disable gnomeui (alias)
-%bcond_without svg # disable svg support
+%bcond_without ldap # disable e-mail address lookups in LDAP
directories
+%bcond_without lightning # disable Sunbird/Lightning calendar
+%bcond_with xulrunner # build with system xulrunner
+%bcond_with tests # enable tests (whatever they check)
+%bcond_without kerberos # disable krb5 support
%if %{without gnome}
%undefine with_gnomeui
%endif
-%define enigmail_ver 1.4.1
+
+%define enigmail_ver 1.4.1
+%define nspr_ver 4.9
+%define nss_ver 3.13.3
+%define xulrunner_ver 12.0
+
+%if %{without xulrunner}
+# The actual sqlite version (see RHBZ#480989):
+%define sqlite_build_version %(pkg-config --silence-errors
--modversion sqlite3 2>/dev/null || echo ERROR)
+%endif
+
Summary: Iceape - web browser
Summary(es.UTF-8): Navegador de Internet Iceape
Summary(pl.UTF-8): Iceape - przeglądarka WWW
@@ -31,48 +46,82 @@
Source7: %{name}-mail.desktop
Source8: %{name}-venkman.desktop
Patch0: %{name}-branding.patch
-Patch1: %{name}-ldap-with-nss.patch
-Patch2: %{name}-kill_slim_hidden_def.patch
-Patch3: %{name}-lib_path.patch
-Patch4: %{name}-fonts.patch
-Patch5: %{name}-ti-agent.patch
-Patch6: %{name}-agent.patch
-Patch7: %{name}-prefs.patch
-Patch8: %{name}-lcrmf.patch
-Patch9: %{name}-pld-branding.patch
-Patch10: %{name}-sqlite.patch
-Patch11: %{name}-libpng.patch
-Patch12: %{name}-libpng15.patch
-Patch13: %{name}-fontconfig.patch
-Patch14: %{name}-build.patch
+Patch1: %{name}-pld-branding.patch
+Patch2: %{name}-agent.patch
+Patch3: %{name}-glueload-fix.patch
+Patch4: system-mozldap.patch
+Patch5: makefile.patch
+Patch6: system-cairo.patch
URL: http://www.pld-linux.org/Packages/Iceape
+BuildRequires: GConf2-devel >= 1.2.1
+BuildRequires: OpenGL-devel
+BuildRequires: alsa-lib-devel
BuildRequires: automake
-%{?with_svg:BuildRequires: cairo-devel >= 1.0.0}
+BuildRequires: bzip2-devel
+BuildRequires: cairo-devel >= 1.10.2-5
+BuildRequires: dbus-glib-devel >= 0.60
BuildRequires: freetype-devel >= 1:2.1.8
-BuildRequires: gtk+2-devel
+BuildRequires: glib2-devel >= 1:2.18
+BuildRequires: gtk+2-devel >= 2:2.10
+%{?with_kerberos:BuildRequires: heimdal-devel >= 0.7.1}
+BuildRequires: hunspell-devel
BuildRequires: libIDL-devel >= 0.8.0
-%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.0}
+BuildRequires: libdnet-devel
+BuildRequires: libevent-devel >= 1.4.7
+# standalone libffi 3.0.9 or gcc's from 4.5(?)+
+BuildRequires: libffi-devel >= 6:3.0.9
+%{?with_gnomeui:BuildRequires: libgnome-devel >= 2.0}
+%{?with_gnomeui:BuildRequires: libgnome-keyring-devel}
+%{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
+BuildRequires: libiw-devel
BuildRequires: libjpeg-devel >= 6b
-BuildRequires: libpng-devel >= 1.2.7
+BuildRequires: libnotify-devel >= 0.4
+BuildRequires: libpng(APNG)-devel >= 0.10
+BuildRequires: libpng-devel >= 1.4.1
BuildRequires: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.6.1
-BuildRequires: nss-devel >= 1:3.11.3
-BuildRequires: perl-modules >= 5.6.0
+BuildRequires: libvpx-devel
+BuildRequires: nspr-devel >= 1:%{nspr_ver}
+BuildRequires: nss-devel >= 1:%{nss_ver}
+BuildRequires: pango-devel >= 1:1.14.0
+BuildRequires: perl-base >= 1:5.6
+BuildRequires: perl-modules >= 5.004
BuildRequires: pkgconfig
+BuildRequires: python >= 1:2.5
+BuildRequires: python-modules
BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.356
+BuildRequires: rpmbuild(macros) >= 1.601
BuildRequires: sed >= 4.0
+BuildRequires: sqlite3-devel >= 3.7.10
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libXScrnSaver-devel
BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xorg-lib-libXft-devel >= 2.1
BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libXp-devel
BuildRequires: xorg-lib-libXt-devel
-BuildRequires: zip >= 2.1
+%if %{with xulrunner}
+BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
+%endif
+BuildRequires: yasm
+BuildRequires: zip
BuildRequires: zlib-devel >= 1.2.3
+Requires(post): mktemp >= 1.5-18
+Requires: desktop-file-utils
+Requires: hicolor-icon-theme
+%if %{with xulrunner}
+%requires_eq_to xulrunner xulrunner-devel
+%else
Requires: browser-plugins >= 2.0
-%{?with_svg:Requires: cairo >= 1.0.0}
-Requires: nspr >= 1:4.6.1
-Requires: nss >= 1:3.11.3
+Requires: cairo >= 1.10.2-5
+Requires: dbus-glib >= 0.60
+Requires: gtk+2 >= 2:2.18
+Requires: libpng >= 1.4.1
+Requires: libpng(APNG) >= 0.10
+Requires: myspell-common
+Requires: nspr >= 1:%{nspr_ver}
+Requires: nss >= 1:%{nss_ver}
+Requires: pango >= 1:1.14.0
+Requires: sqlite3 >= %{sqlite_build_version}
+Requires: startup-notification >= 0.8
+%endif
Provides: iceape-embedded = %{epoch}:%{version}-%{release}
Provides: wwwbrowser
Obsoletes: light
@@ -85,19 +134,16 @@
Obsoletes: seamonkey-gnomevfs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _iceapedir %{_libdir}/%{name}
-%define _chromedir %{_libdir}/%{name}/chrome
+%define topdir %{_builddir}/%{name}-%{version}
+%define objdir %{topdir}/obj-%{_target_cpu}
%define filterout_cpp -D_FORTIFY_SOURCE=[0-9]+
-# iceweasel/icedove/iceape provide their own versions
-%define _noautoreqdep libgfxpsshar.so libgkgfx.so
libgtkxtbin.so libjsj.so libxlibrgb.so libxpcom_compat.so libxpistub.so
-# we don't want these to satisfy xulrunner-devel
-%define _noautoprov libgtkembedmoz.so libldap50.so
libmozjs.so libprldap50.so libssldap50.so libxpcom.so libxul.so libxpcom_core.so
+# don't satisfy other packages
+%define _noautoprovfiles %{_libdir}/%{name}
# and as we don't provide them, don't require either
-%define _noautoreq libgtkembedmoz.so libldap50.so
libmozjs.so libprldap50.so libssldap50.so libxpcom.so libxul.so libxpcom_core.so
-
-%define specflags -fno-strict-aliasing
+%define _noautoreq libmozjs.so libxpcom.so libxul.so
libjemalloc.so %{!?with_xulrunner:libmozalloc.so}
+%define _noautoreqdep libgfxpsshar.so libgkgfx.so
libgtkxtbin.so libjsj.so libxpcom_compat.so libxpistub.so
%description
Iceape is an open-source web browser, designed for standards
@@ -120,12 +166,26 @@
текстами, разработанный для максимального соотвествия стандартам,
максмимальной переносимости и скорости работы
+%package addon-lightning
+Summary: An integrated calendar for Iceape
+Summary(pl.UTF-8): Zintegrowany kalendarz dla Iceape
+License: MPL 1.1 or GPL v2+ or LGPL v2.1+
+Group: Applications/Networking
+Requires: %{name} = %{version}-%{release}
+Obsoletes: seamonkey-addon-lightning
+
+%description addon-lightning
+Lightning is an calendar extension to Icedove email client.
+
+%description addon-lightning -l pl.UTF-8
+Lightning to rozszerzenie do klienta poczty Icedove dodające
+funkcjonalność kalendarza.
+
%package addon-enigmail
Summary: Enigmail %{enigmail_ver} - PGP/GPG support for Iceape
Summary(pl.UTF-8): Enigmail %{enigmail_ver} - obsługa PGP/GPG dla Iceape
Group: X11/Applications/Networking
-Requires(post,postun): %{name}-mailnews = %{epoch}:%{version}-%{release}
-Requires: %{name}-mailnews = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: gnupg >= 1.4.2.2
Obsoletes: seamonkey-addon-enigmail
@@ -191,204 +251,290 @@
%prep
%setup -qc
-cd mozilla
-/bin/sh %{SOURCE3}
-tar -jxf %{SOURCE2}
+cd comm-release
tar -C mailnews/extensions -zxf %{SOURCE1}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%if "%{pld_release}" == "ti"
%patch5 -p1
-%else
%patch6 -p1
-%endif
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p2
-%patch12 -p2
-%patch13 -p2
-%patch14 -p2
%build
-cd mozilla
+cd comm-release
+%if %{with xulrunner}
+if [ "$(grep -E '^[0-9]+\.' mozilla/config/milestone.txt)" !=
"%{xulrunner_ver}" ]; then
+ echo >&2
+ echo >&2 "Xulrunner version %{xulrunner_ver} does not match
mozilla/config/milestone.txt!"
+ echo >&2
+ exit 1
+fi
+%endif
-cp -f /usr/share/automake/config.* build/autoconf
-cp -f /usr/share/automake/config.* nsprpub/build/autoconf
-cp -f /usr/share/automake/config.* directory/c-sdk/config/autoconf
-ac_cv_visibility_pragma=no; export ac_cv_visibility_pragma
-%configure2_13 \
- %{!?debug:--disable-debug} \
- --disable-elf-dynstr-gc \
- %{!?with_gnomeui:--disable-gnomeui} \
- --disable-pedantic \
- --disable-tests \
- --disable-xterm-updates \
- --enable-application=suite \
- --enable-crypto \
- --enable-default-toolkit=gtk2 \
- --enable-extensions \
- --enable-ldap \
- --enable-mathml \
- --enable-optimize="%{rpmcflags}" \
- --enable-postscript \
- %{?with_svg:--enable-svg --enable-svg-renderer-cairo} \
- %{?with_svg:--enable-system-cairo} \
- --enable-xft \
- --enable-xinerama \
- --enable-xprint \
- --enable-old-abi-compat-wrappers \
- --with-default-mozilla-five-home=%{_iceapedir} \
- --with-pthreads \
- --with-system-jpeg \
- --with-system-nspr \
- --with-system-nss \
- --with-system-png \
- --with-system-zlib \
- --with-x
+cp -f %{_datadir}/automake/config.* build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
+cp -f %{_datadir}/automake/config.* ldap/sdks/c-sdk/config/autoconf
-%{__make}
+cat << EOF > .mozconfig
+mk_add_options MOZ_OBJDIR=%{objdir}
+
+export CFLAGS="%{rpmcflags}"
+export CXXFLAGS="%{rpmcflags}"
+
+%if %{with crashreporter}
+export MOZ_DEBUG_SYMBOLS=1
+%endif
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=%{_prefix}
+ac_add_options --exec-prefix=%{_exec_prefix}
+ac_add_options --bindir=%{_bindir}
+ac_add_options --sbindir=%{_sbindir}
+ac_add_options --sysconfdir=%{_sysconfdir}
+ac_add_options --datadir=%{_datadir}
+ac_add_options --includedir=%{_includedir}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --libexecdir=%{_libexecdir}
+ac_add_options --localstatedir=%{_localstatedir}
+ac_add_options --sharedstatedir=%{_sharedstatedir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --infodir=%{_infodir}
+ac_add_options --disable-elf-hack
+%if %{?debug:1}0
+ac_add_options --disable-optimize
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
+ac_add_options --enable-debugger-info-modules
+ac_add_options --enable-crash-on-assert
+%else
+ac_add_options --disable-debug
+ac_add_options --disable-debug-modules
+ac_add_options --disable-logging
+ac_add_options --enable-optimize="%{rpmcflags} -Os"
+%endif
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
+%if %{with tests}
+ac_add_options --enable-tests
+%else
+ac_add_options --disable-tests
+%endif
+ac_add_options --enable-gio
+%if %{with gnomeui}
+ac_add_options --enable-gnomeui
+%else
+ac_add_options --disable-gnomeui
+%endif
+ac_add_options --disable-gnomevfs
+%if %{with ldap}
+ac_add_options --enable-ldap
+ac_add_options --with-system-ldap
+%else
+ac_add_options --disable-ldap
+%endif
+%if %{with crashreporter}
+ac_add_options --enable-crashreporter
+%else
+ac_add_options --disable-crashreporter
+%endif
+ac_add_options --disable-xterm-updates
+ac_add_options --enable-postscript
+%if %{with lightning}
+ac_add_options --enable-calendar
+%else
+ac_add_options --disable-calendar
+%endif
+ac_add_options --disable-installer
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-updater
+ac_add_options --enable-crypto
+ac_add_options --enable-libxul
+ac_add_options --enable-pango
+ac_add_options --enable-shared-js
+ac_add_options --enable-startup-notification
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-application=suite
+ac_add_options --with-distribution-id=org.pld-linux
+%if %{with xulrunner}
+ac_add_options --with-system-libxul
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
+%endif
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-ffi
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
+EOF
+
+%{__make} -j1 -f client.mk build \
+ STRIP="/bin/true" \
+ MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
+ installdir=%{_libdir}/%{name} \
+ CC="%{__cc}" \
+ CXX="%{__cxx}"
+
+%if %{with crashreporter}
+# create debuginfo for crash-stats.mozilla.com
+%{__make} -j1 -C obj-%{_target_cpu} buildsymbols
+%endif
+
+%if %{with enigmail}
cd mailnews/extensions/enigmail
-./makemake -r
-%{__make}
-cd ../../..
+./makemake -r -o %{objdir}
+%{__make} -C %{objdir}/mailnews/extensions/enigmail \
+ STRIP="/bin/true" \
+ CC="%{__cc}" \
+ CXX="%{__cxx}"
+%endif
%install
rm -rf $RPM_BUILD_ROOT
-cd mozilla
+cd comm-release
install -d \
- $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_datadir}} \
+ $RPM_BUILD_ROOT{%{_bindir},%{_libdir}} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
-
$RPM_BUILD_ROOT%{_datadir}/%{name}/{chrome,defaults,dictionaries,icons,greprefs,res,searchplugins}
\
- $RPM_BUILD_ROOT%{_iceapedir}/{components,plugins}
+ $RPM_BUILD_ROOT%{_datadir}/%{name} \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
-# preparing to create register
-# remove empty directory trees
-rm -fr
dist/bin/chrome/{US,chatzilla,classic,comm,content-packs,cview,embed,embed-sample,en-US,en-mac,en-unix,en-win,help,inspector,messenger,modern,pipnss,pippki,toolkit,venkman,xmlterm}
-# non-unix
-rm -f dist/bin/chrome/en-{mac,win}.jar
-
-# creating and installing register
-LD_LIBRARY_PATH="dist/bin" MOZILLA_FIVE_HOME="dist/bin" dist/bin/regxpcom
-LD_LIBRARY_PATH="dist/bin" MOZILLA_FIVE_HOME="dist/bin" dist/bin/regchrome
-
-ln -sf ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_chromedir}
-ln -sf ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_iceapedir}/defaults
-ln -sf ../../share/%{name}/dictionaries
$RPM_BUILD_ROOT%{_iceapedir}/dictionaries
-ln -sf ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_iceapedir}/greprefs
-ln -sf ../../share/%{name}/icons $RPM_BUILD_ROOT%{_iceapedir}/icons
-ln -sf ../../share/%{name}/res $RPM_BUILD_ROOT%{_iceapedir}/res
-ln -sf ../../share/%{name}/searchplugins
$RPM_BUILD_ROOT%{_iceapedir}/searchplugins
-
-cp -frL dist/bin/chrome/* $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
-cp -frL dist/bin/components/{[!m],m[!y]}*
$RPM_BUILD_ROOT%{_iceapedir}/components
-cp -frL dist/bin/defaults/* $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-cp -frL dist/bin/dictionaries/*
$RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries
-cp -frL dist/bin/greprefs/* $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
-cp -frL dist/bin/res/* $RPM_BUILD_ROOT%{_datadir}/%{name}/res
-cp -frL dist/bin/searchplugins/*
$RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-install dist/bin/*.so $RPM_BUILD_ROOT%{_iceapedir}
+cd %{objdir}
+%{__make} -C suite/installer stage-package \
+ DESTDIR=$RPM_BUILD_ROOT \
+ installdir=%{_libdir}/%{name} \
+ PKG_SKIP_STRIP=1
+
+cp -a mozilla/dist/iceape/* $RPM_BUILD_ROOT%{_libdir}/%{name}/
+
+%if %{with xulrunner}
+# >= 5.0 seems to require this
+ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
+%endif
-ln -s %{_libdir}/libnssckbi.so $RPM_BUILD_ROOT%{_iceapedir}/libnssckbi.so
+# Enable crash reporter for Thunderbird application
+%if %{with crashreporter}
+%{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/'
$RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini
+
+# Add debuginfo for crash-stats.mozilla.com
+install -d $RPM_BUILD_ROOT%{_exec_prefix}/lib/debug%{_libdir}/%{name}
+cp -a mozilla/dist/%{name}-%{version}.en-US.linux-*.crashreporter-symbols.zip
$RPM_BUILD_ROOT%{_prefix}/lib/debug%{_libdir}/%{name}
+%endif
-install %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} \
- $RPM_BUILD_ROOT%{_desktopdir}
+# copy manually lightning files, somewhy they are not installed by make
+cp -a mozilla/dist/bin/extensions/[email protected] \
+ mozilla/dist/bin/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
+
+# 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}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
$RPM_BUILD_ROOT%{_datadir}/%{name}/modules
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
$RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
+%if %{without xulrunner}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js
$RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs.js
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
+%endif
-install suite/branding/icons/gtk/iceape.png $RPM_BUILD_ROOT%{_pixmapsdir}
+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}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
+ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
+ln -s ../../share/%{name}/searchplugins
$RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
+%if %{without xulrunner}
+ln -s ../../share/%{name}/greprefs.js
$RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs.js
+ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
+%endif
-install dist/bin/iceape-bin $RPM_BUILD_ROOT%{_iceapedir}
-install dist/bin/regchrome $RPM_BUILD_ROOT%{_iceapedir}
-install dist/bin/regxpcom $RPM_BUILD_ROOT%{_iceapedir}
-install dist/bin/xpidl $RPM_BUILD_ROOT%{_iceapedir}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/* \
+ $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/
-cp $RPM_BUILD_ROOT%{_chromedir}/installed-chrome.txt \
- $RPM_BUILD_ROOT%{_chromedir}/%{name}-installed-chrome.txt
+# dir for arch independant extensions besides arch dependant extensions
+# see mozilla/xpcom/build/nsXULAppAPI.h
+# XRE_SYS_LOCAL_EXTENSION_PARENT_DIR and XRE_SYS_SHARE_EXTENSION_PARENT_DIR
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
+
+%if %{without xulrunner}
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
+%endif
-cat << 'EOF' > $RPM_BUILD_ROOT%{_bindir}/iceape
-#!/bin/sh
-# (c) vip at linux.pl, wolf at pld-linux.org
+sed 's,@LIBDIR@,%{_libdir},' %{SOURCE7} > $RPM_BUILD_ROOT%{_bindir}/iceape
+chmod a+rx $RPM_BUILD_ROOT%{_bindir}/iceape
-LD_LIBRARY_PATH=%{_iceapedir}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+install %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+ $RPM_BUILD_ROOT%{_desktopdir}
-MOZILLA_FIVE_HOME="%{_iceapedir}"
-ICEAPE="$MOZILLA_FIVE_HOME/iceape-bin"
-if [ "$1" == "-remote" ]; then
- exec $ICEAPE "$@"
-fi
+cp -p %{topdir}/comm-release/suite/branding/nightly/content/icon64.png
$RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
-PING=`$ICEAPE -remote 'ping()' 2>&1 >/dev/null`
-if [ -n "$PING" ]; then
- if [ -f "`pwd`/$1" ]; then
- exec $ICEAPE "file://`pwd`/$1"
- else
- exec $ICEAPE "$@"
- fi
-fi
+# files created by iceape -register
+touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
+touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
-if [ -z "$1" ]; then
- exec $ICEAPE -remote 'xfeDoCommand (openBrowser)'
-elif [ "$1" == "-mail" ]; then
- exec $ICEAPE -remote 'xfeDoCommand (openInbox)'
-elif [ "$1" == "-compose" ]; then
- exec $ICEAPE -remote 'xfeDoCommand (composeMessage)'
-fi
+cat << 'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/register
+#!/bin/sh
+umask 022
+rm -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
-[[ $1 == -* ]] && exec $ICEAPE "$@"
+# it attempts to touch files in $HOME/.mozilla
+# beware if you run this with sudo!!!
+export HOME=$(mktemp -d)
+# also TMPDIR could be pointing to sudo user's homedir
+unset TMPDIR TMP || :
-if [ -f "`pwd`/$1" ]; then
- URL="file://`pwd`/$1"
-else
- URL="$1"
-fi
-if grep -q -E 'browser.tabs.opentabfor.middleclick.*true' \
- ~/.mozilla/default/*/prefs.js; then
- exec $ICEAPE -remote "OpenUrl($URL,new-tab)"
- else
- exec $ICEAPE -remote "OpenUrl($URL,new-window)"
-fi
+%{_libdir}/%{name}/iceape -register
-echo "Cannot execute Iceape ($ICEAPE)!" >&2
-exit 1
+rm -rf $HOME
EOF
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/%{name}/register
-ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/seamonkey
-
-cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
-#!/bin/sh
-umask 022
-cd %{_datadir}/%{name}/chrome
-cat *-installed-chrome.txt > installed-chrome.txt
-rm -f chrome.rdf overlays.rdf
-rm -f %{_iceapedir}/components/{compreg,xpti}.dat
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/packages/iceape/iceape.spec?r1=1.39&r2=1.40
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
