packages: icedove/icedove.sh, icedove/icedove.spec - rel 2 - revert change ...

[baggins]

Author: baggins                      Date: Wed Jun  6 09:16:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- revert change to icedove.sh, install missing script instead

---- Files affected:
packages/icedove:
   icedove.sh (1.11 -> 1.12) , icedove.spec (1.160 -> 1.161) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.sh
diff -u packages/icedove/icedove.sh:1.11 packages/icedove/icedove.sh:1.12
--- packages/icedove/icedove.sh:1.11	Wed Jun  6 11:01:26 2012
+++ packages/icedove/icedove.sh	Wed Jun  6 11:16:10 2012
@@ -20,7 +20,7 @@
 	fi
 done
 
-ICEDOVE="$LIBDIR/run-mozilla.sh"
+ICEDOVE="$LIBDIR/icedove"
 
 if [ "$1" = "-remote" ]; then
 	exec $ICEDOVE "$@"
@@ -31,11 +31,10 @@
 	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

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.160 packages/icedove/icedove.spec:1.161
--- packages/icedove/icedove.spec:1.160	Wed Jun  6 07:58:23 2012
+++ packages/icedove/icedove.spec	Wed Jun  6 11:16:10 2012
@@ -35,7 +35,7 @@
 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
@@ -391,6 +391,10 @@
 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, at 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
@@ -568,6 +572,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.161  2012/06/06 09:16:10  baggins
+- rel 2
+- revert change to icedove.sh, install missing script instead
+
 Revision 1.160  2012/06/06 05:58:23  baggins
 - up to 13.0
 - enigmail 1.4.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/icedove/icedove.sh?r1=1.11&r2=1.12
    http://cvs.pld-linux.org/packages/icedove/icedove.spec?r1=1.160&r2=1.161