packages: icedove/icedove-branding.patch, icedove/icedove.spec - 3.1.3 - wo...

[blues]

Author: blues                        Date: Wed Sep  8 12:52:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.1.3 - works now

---- Files affected:
packages/icedove:
   icedove-branding.patch (1.18 -> 1.19) , icedove.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/icedove/icedove-branding.patch
diff -u packages/icedove/icedove-branding.patch:1.18 packages/icedove/icedove-branding.patch:1.19
--- packages/icedove/icedove-branding.patch:1.18	Thu Jul  8 11:29:10 2010
+++ packages/icedove/icedove-branding.patch	Wed Sep  8 14:52:32 2010
@@ -159,23 +159,6 @@
            U.S. GOVERNMENT END USERS. The Software is a “commercial item,”
            as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of
            “commercial computer software” and “commercial computer software
-diff -urN mozilla.orig//mail/build.mk mozilla/mail/build.mk
---- mozilla.orig//mail/build.mk	2010-07-05 21:35:29.562082558 +0200
-+++ mozilla/mail/build.mk	2010-07-05 21:39:36.174349684 +0200
-@@ -117,11 +117,11 @@
- APP_NAME := $(APP_NAME)Debug
- endif
- PROGRAM_LOCATION = ../../../$(DIST)/$(APP_NAME).app/Contents/MacOS/
--PROGRAM = $(PROGRAM_LOCATION)thunderbird-bin$(BIN_SUFFIX)
-+PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
- else
- # Non-mac options
- PROGRAM_LOCATION = ../../../$(DIST)/bin/
--PROGRAM = $(PROGRAM_LOCATION)thunderbird$(BIN_SUFFIX)
-+PROGRAM = $(PROGRAM_LOCATION)$(MOZ_APP_NAME)$(BIN_SUFFIX)
- endif
- 
- mozmill::
 diff -urN mozilla.orig//mail/confvars.sh mozilla/mail/confvars.sh
 --- mozilla.orig//mail/confvars.sh	2010-07-05 21:35:29.801718821 +0200
 +++ mozilla/mail/confvars.sh	2010-07-05 21:39:36.174349684 +0200
@@ -211,3 +194,14 @@
    if (gAppData->copyright)
        printf(", %s", gAppData->copyright);
    printf("\n");
+--- mozilla/mail/build.mk.org	2010-09-08 14:21:26.169329050 +0200
++++ mozilla/mail/build.mk	2010-09-08 14:24:01.644480272 +0200
+@@ -119,7 +119,7 @@ endif
+ PROGRAM = ../../../$(DIST)/$(APP_NAME).app/
+ else
+ # Non-mac options
+-PROGRAM = ../../../$(DIST)/bin/thunderbird$(BIN_SUFFIX)
++PROGRAM = ../../../$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
+ endif
+ 
+ mozmill::

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.100 packages/icedove/icedove.spec:1.101
--- packages/icedove/icedove.spec:1.100	Wed Sep  1 08:46:43 2010
+++ packages/icedove/icedove.spec	Wed Sep  8 14:52:32 2010
@@ -33,12 +33,12 @@
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	3.1.2
-Release:	2
+Version:	3.1.3
+Release:	1
 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
-# Source0-md5:	48e80576a7af70e64d30a5162364525a
+# Source0-md5:	46332e1d9a658f6e31797035107b1a8d
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	7d329d5e8afbbb28214ca1995beb09c9
 Source2:	%{name}-branding.tar.bz2
@@ -516,6 +516,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2010/09/08 12:52:32  blues
+- 3.1.3 - works now
+
 Revision 1.100  2010/09/01 06:46:43  glen
 - i'm not sure, but shouldn't we skip providing/requiring libxpcom_core.so as well?; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-branding.patch?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.100&r2=1.101&f=u