]> git.pld-linux.org Git - packages/thunderbird.git/blobdiff - icedove.spec
- fixed enigmail building
[packages/thunderbird.git] / icedove.spec
index d9e060d5a949b715bca95743bc1a8f5d8fef8d91..1ecf8559e9c6db857cde738981c322e8b38fac68 100644 (file)
@@ -1,8 +1,4 @@
 #
-# TODO:
-#   - CHECK all features of enigmail
-#   - separate spec for enigmail
-#
 # Conditional builds
 %bcond_without enigmail        # don't build enigmail - GPG/PGP support
 %bcond_without gnomeui         # disable gnomeui support
 %undefine      with_gnomeui
 %undefine      with_gnomevfs
 %endif
-%define                enigmail_ver            0.95.7
+%define                enigmail_ver            1.0.0
 
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       2.0.0.17
-Release:       1
+Version:       3.0
+Release:       0.1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         Applications/Networking
-Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
-# Source0-md5: 3adb8fabdc26a5859c55b9ce241edb3f
+Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
+# Source0-md5: 9a564ac2489b1b0f9348dc298b913f6c
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5: bbee59bab58b97e33e85015a5ae5de7b
+# Source1-md5: e3a6d379f1a72ac023751bdde2de750a
 Source2:       %{name}-branding.tar.bz2
 # Source2-md5: e775b8cb658de32f30b403bc9b7950bf
 Source3:       %{name}-rm_nonfree.sh
@@ -42,6 +38,7 @@ Patch5:               %{name}-install.patch
 Patch6:                %{name}-myspell.patch
 Patch7:                %{name}-regionNames.patch
 Patch8:                %{name}-prefs.patch
+Patch9:                %{name}-gcc44.patch
 URL:           http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
 BuildRequires: automake
@@ -55,8 +52,8 @@ BuildRequires:        libjpeg-devel >= 6b
 BuildRequires: libpng-devel >= 1.2.0
 BuildRequires: libstdc++-devel
 BuildRequires: myspell-devel
-BuildRequires: nspr-devel >= 1:4.6.1
-BuildRequires: nss-devel >= 1:3.11.3
+BuildRequires: nspr-devel >= 1:4.8
+BuildRequires: nss-devel >= 1:3.12.0
 BuildRequires: pango-devel >= 1:1.1.0
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libXext-devel
@@ -125,32 +122,35 @@ Główne możliwości:
 
 %prep
 %setup -q -c -a2
-cd mozilla
+cd comm-1.9.1
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 /bin/sh %{SOURCE3}
-%patch0 -p1
-%patch1 -p1
+##%patch0 -p1
+##%patch1 -p1
 %{?with_enigmail:%patch2 -p1}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+##%patch3 -p1
+#%patch4 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
+#%patch8 -p0
+#%patch9 -p1
 
-:> config/gcc_hidden.h
+##:> config/gcc_hidden.h
 
 %build
-cd mozilla
+cd comm-1.9.1
 export CFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 export CXXFLAGS="%{rpmcflags} `%{_bindir}/pkg-config mozilla-nspr --cflags-only-I`"
 
-cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/build/autoconf
+cp -f %{_datadir}/automake/config.* mozilla/nsprpub/build/autoconf
 cp -f %{_datadir}/automake/config.* directory/c-sdk/config/autoconf
 
 cat << 'EOF' > .mozconfig
-. $topsrcdir/mail/config/mozconfig
+#. $topsrcdir/mail/config/mozconfig
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
@@ -192,13 +192,15 @@ ac_add_options --enable-ldap
 %else
 ac_add_options --disable-ldap
 %endif
+ac_add_options --enable-calendar
 ac_add_options --disable-installer
 ac_add_options --disable-jsd
 ac_add_options --disable-xprint
+ac_add_options --disable-permissions
+ac_add_options --disable-pref-extensions
 ac_add_options --enable-canvas
 ac_add_options --enable-crypto
 ac_add_options --enable-default-toolkit="gtk2"
-ac_add_options --enable-extensions="pref,cookie,wallet,spellcheck"
 ac_add_options --enable-mathml
 ac_add_options --enable-optimize="%{rpmcflags}"
 ac_add_options --enable-pango
@@ -209,6 +211,8 @@ ac_add_options --enable-system-cairo
 ac_add_options --enable-system-myspell
 ac_add_options --enable-svg
 ac_add_options --enable-xft
+ac_add_options --enable-application=mail
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-xinerama
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
@@ -218,18 +222,19 @@ ac_add_options --with-system-zlib
 ac_add_options --with-pthreads
 ac_add_options --enable-single-profile
 ac_add_options --disable-profilesharing
-ac_add_options --with-branding=icedove/branding
+ac_add_options --with-distribution-id=org.pld-linux
+#ac_add_options --with-branding=icedove/branding
 ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
 EOF
 
-%{__make} -j1 -f client.mk build_all \
+%{__make} -j1 -f client.mk build \
        CC="%{__cc}" \
        CXX="%{__cxx}"
 
 %if %{with enigmail}
        cd mailnews/extensions/enigmail
        ./makemake -r
-       %{__make}
+       %{__make} -C obj-%{_target_cpu}/mailnews/extensions/enigmail
 %endif
 
 %install
@@ -237,8 +242,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \
        $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-cd mozilla
-%{__make} -C xpinstall/packager stage-package \
+cd comm-1.9.1
+%{__make} -C obj-%{_target_cpu}/mail/installer stage-package \
        DESTDIR=$RPM_BUILD_ROOT \
        MOZ_PKG_APPDIR=%{_libdir}/%{name} \
        PKG_SKIP_STRIP=1
@@ -274,9 +279,10 @@ install -d $_enig_dir/chrome
 install -d $_enig_dir/components
 install -d $_enig_dir/defaults/preferences
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail.jar $_enig_dir/chrome
-mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome
+mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmail-skin-seamonkey.jar $_enig_dir/chrome
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig* $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so $_enig_dir/components
+mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libipc.so $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt $_enig_dir/components
 mv -f $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults/preferences/enigmail.js $_enig_dir/defaults/preferences
 cp -f mailnews/extensions/enigmail/package/install.rdf $_enig_dir
This page took 0.075866 seconds and 4 git commands to generate.