]> git.pld-linux.org Git - packages/thunderbird.git/blobdiff - icedove.spec
projects / packages / thunderbird.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- little update
[packages/thunderbird.git] / icedove.spec
diff --git a/icedove.spec b/icedove.spec
index 930b6a30b456ae7c805d03192cc0b46f789164be..298cac4b25c5dafdc41de7db28c029298861179a 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -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
@@ -14,36 +10,34 @@
 %undefine      with_gnomeui
 %undefine      with_gnomevfs
 %endif
-%define                enigmail_ver            0.95.6
+%define                enigmail_ver            1.0.0
 
 Summary:       Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
-Version:       2.0.0.16
-Release:       2
+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: 591c9f80a2f6772c5acf8fb6128f40bd
+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: cfbe6ff77f80a349b396829757ad952a
+# Source1-md5: e3a6d379f1a72ac023751bdde2de750a
 Source2:       %{name}-branding.tar.bz2
 # Source2-md5: e775b8cb658de32f30b403bc9b7950bf
 Source3:       %{name}-rm_nonfree.sh
 Source4:       %{name}.desktop
 Source5:       %{name}.sh
-Source6:       %{name}-ti.sh
-Source7:       %{name}-enigmail.manifest
+Source6:       %{name}-enigmail.manifest
 Patch0:                %{name}-branding.patch
-Patch1:                %{name}-lib_path.patch
-Patch2:                %{name}-enigmail-shared.patch
-Patch3:                %{name}-gcc.patch
-Patch4:                %{name}-fonts.patch
-Patch5:                %{name}-install.patch
-Patch6:                %{name}-myspell.patch
-Patch7:                %{name}-regionNames.patch
-Patch8:                %{name}-prefs.patch
-URL:           http://www.mozilla.org/projects/thunderbird/
+Patch1:                %{name}-enigmail-shared.patch
+Patch2:                %{name}-gcc.patch
+Patch3:                %{name}-fonts.patch
+Patch4:                %{name}-install.patch
+Patch5:                %{name}-myspell.patch
+Patch6:                %{name}-prefs.patch
+Patch7:                %{name}-breakpad.patch
+URL:           http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
 BuildRequires: automake
 BuildRequires: freetype-devel >= 1:2.1.8
@@ -56,8 +50,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
@@ -112,8 +106,8 @@ Main Features:
 
 %description addon-enigmail -l pl.UTF-8
 Enigmail to rozszerzenie klienta pocztowego Icedove pozwalające
-użytkownikom na dostęp do uwierzytelniania i szyfrowania
-zapewnianego przez GnuPG.
+użytkownikom na dostęp do uwierzytelniania i szyfrowania zapewnianego
+przez GnuPG.
 
 Główne możliwości:
 - szyfrowanie/podpisywanie poczty przy wysyłaniu,
@@ -126,32 +120,30 @@ 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
-%{?with_enigmail:%patch2 -p1}
+%{?with_enigmail:%patch1 -p1}
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch5 -p1
+%patch6 -p0
 %patch7 -p1
-%patch8 -p1
-
-:> 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
+
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
 ac_add_options --prefix=%{_prefix}
 ac_add_options --exec-prefix=%{_exec_prefix}
@@ -193,23 +185,28 @@ 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
 ac_add_options --enable-reorder
+ac_add_options --enable-static
 ac_add_options --disable-strip
 ac_add_options --disable-strip-libs
 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
@@ -219,27 +216,29 @@ 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
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_pixmapsdir},%{_desktopdir}} \
-       $RPM_BUILD_ROOT%{_datadir}/%{name}
+              $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT%{_libdir}/%{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
@@ -249,7 +248,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/c
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
 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}/init.d $RPM_BUILD_ROOT%{_datadir}/%{name}/init.d
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
@@ -263,11 +262,7 @@ ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 
-%if "%{pld_release}" == "ti"
-%{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE6} > $RPM_BUILD_ROOT%{_bindir}/icedove
-%else
 %{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/icedove
-%endif
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 
@@ -279,9 +274,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
@@ -292,8 +288,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome/enigmime.jar
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/components/enig*
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/libenigmime.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/components/ipc.xpt
-cp -f %{SOURCE7} $_enig_dir/chrome.manifest
-cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png
+cp -f %{SOURCE6} $_enig_dir/chrome.manifest
+#cp -f icedove/branding/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/icedove.png
 %endif
 
 # win32 stuff
@@ -320,6 +316,7 @@ exit 0
 %attr(755,root,root) %{_bindir}/mozilla-thunderbird
 %attr(755,root,root) %{_bindir}/thunderbird
 %dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.ini
 %dir %{_libdir}/%{name}/components
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %{_libdir}/%{name}/components/*.js
@@ -328,10 +325,10 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
-%attr(755,root,root) %{_libdir}/%{name}/reg*
-%attr(755,root,root) %{_libdir}/%{name}/icedove
+#%attr(755,root,root) %{_libdir}/%{name}/reg*
+#%attr(755,root,root) %{_libdir}/%{name}/icedove
 %{_libdir}/%{name}/*.txt
-%attr(755,root,root) %{_libdir}/%{name}/x*
+#%attr(755,root,root) %{_libdir}/%{name}/x*
 
 # symlinks
 %{_libdir}/%{name}/chrome
@@ -345,8 +342,8 @@ exit 0
 
 %{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/updater
-%{_libdir}/%{name}/updater.ini
-%{_pixmapsdir}/*.png
+%{_libdir}/%{name}/update.locale
+#%{_pixmapsdir}/*.png
 %{_desktopdir}/*.desktop
 
 %dir %{_datadir}/%{name}
@@ -354,10 +351,17 @@ exit 0
 %{_datadir}/%{name}/defaults
 %{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
-%{_datadir}/%{name}/init.d
+#%{_datadir}/%{name}/init.d
 %{_datadir}/%{name}/isp
 %{_datadir}/%{name}/res
 
+%dir %{_libdir}/%{name}/modules
+%{_libdir}/%{name}/modules/*.js*
+%dir %{_libdir}/%{name}/modules/activity
+%{_libdir}/%{name}/modules/activity/*.js
+%dir %{_libdir}/%{name}/modules/gloda
+%{_libdir}/%{name}/modules/gloda/*.js
+
 %dir %{_libdir}/%{name}/extensions
 %{_libdir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 
Thunderbird - email client
This page took 0.069797 seconds and 4 git commands to generate.