- rel 2

- revert change to icedove.sh, install missing script instead

Changed files:
    icedove.sh -> 1.12
    icedove.spec -> 1.161

diff --git a/icedove.sh b/icedove.sh
index c8e82ff2126d6b4b4d7cd7c4a194bb47277ca0f8..6c88b2e80509c2b9bba7c701eb5969001f92b602 100644 (file)
--- a/icedove.sh
+++ b/icedove.sh
@@ -20,7 +20,7 @@ for f in ~/.icedove/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
        fi
 done
 
-ICEDOVE="$LIBDIR/run-mozilla.sh"
+ICEDOVE="$LIBDIR/icedove"
 
 if [ "$1" = "-remote" ]; then
        exec $ICEDOVE "$@"
@@ -31,11 +31,10 @@ else
        else
                case "$1" in
                -compose|-editor)
-                       shift
-                       exec $ICEDOVE -remote 'xfeDoCommand (composeMessage)' "$@"
+                       exec $ICEDOVE -remote 'xfeDoCommand (composeMessage)'
                        ;;
                *)
-                       exec $ICEDOVE -remote 'xfeDoCommand (openInbox)' "$@"
+                       exec $ICEDOVE -remote 'xfeDoCommand (openInbox)'
                        ;;
                esac
        fi

diff --git a/icedove.spec b/icedove.spec
index 4b0e3786a51151307aa0407536582c18b20ad6be..55ecb47ad70bc4a10666ea4fdd1869f318d84640 100644 (file)
--- a/icedove.spec
+++ b/icedove.spec
@@ -34,7 +34,7 @@ Summary:      Icedove - email client
 Summary(pl.UTF-8):     Icedove - klient poczty
 Name:          icedove
 Version:       13.0
-Release:       1
+Release:       2
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
@@ -390,6 +390,10 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
 %endif
 
+%{__sed} -e "s|%MOZAPPDIR%|%{_libdir}/%{name}|" \
+        -e "s|%MOZ_APP_DISPLAYNAME%|Icedove|" \
+       %{topdir}/mozilla/mozilla/build/unix/mozilla.in > $RPM_BUILD_ROOT%{_libdir}/%{name}/icedove
+
 %{__sed} -e 's,@LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/icedove
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird