Author: freetz                       Date: Mon Feb 13 15:59:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged to HEAD and updated to 2.2.0

---- Files affected:
SPECS:
   sylpheed.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/sylpheed.spec
diff -u SPECS/sylpheed.spec:1.173 SPECS/sylpheed.spec:1.174
--- SPECS/sylpheed.spec:1.173   Tue Jan 17 16:47:50 2006
+++ SPECS/sylpheed.spec Mon Feb 13 16:59:28 2006
@@ -1,8 +1,9 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without faces           # without compfaces support
+%bcond_without compface        # without compface support
 %bcond_without gpg             # without GnuPG support
+%bcond_without gtkspell        # without gtkspell support
 %bcond_without ipv6            # without IPv6 support
 %bcond_without jpilot          # without JPilot support
 %bcond_without ldap            # without LDAP support
@@ -12,20 +13,21 @@
 Summary(pl):   Szybki klient poczty bazujący na GTK+
 Summary(pt_BR):        Um rápido e leve cliente de email baseado em GTK+
 Name:          sylpheed
-Version:       2.0.4
-Release:       2
+Version:       2.2.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Networking
-Source0:       
http://sylpheed.good-day.net/sylpheed/v2.0/%{name}-%{version}.tar.bz2
-# Source0-md5: c9f1c4cf2b3933ebbb58519ba3b77887
+Source0:       
http://sylpheed.good-day.net/sylpheed/v2.2/%{name}-%{version}.tar.bz2
+# Source0-md5: da23e5c6ef869c4fe847ea9207f40ddf
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-nolibs.patch
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
-%{?with_faces:BuildRequires:   faces-devel}
+%{?with_compface:BuildRequires:        compface-devel}
 BuildRequires: gettext-devel
 %{?with_gpg:BuildRequires:     gpgme-devel >= 1:0.4.5}
 BuildRequires: gtk+2-devel >= 2:2.4.0
+%{?with_gtkspell:BuildRequires:        gtkspell-devel}
 BuildRequires: libtool
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
@@ -82,9 +84,8 @@
 %patch1 -p1
 
 mv -f po/{sr,[EMAIL PROTECTED]
-mv -f po/{zh_TW.Big5,zh_TW}.po
 
-%{__perl} -pi -e 's/ sr / [EMAIL PROTECTED] /;s/zh_TW\.Big5/zh_TW/' 
configure.in
+%{__perl} -pi -e 's/ sr / [EMAIL PROTECTED] /' configure.in
 
 %build
 %{__libtoolize}
@@ -93,13 +94,13 @@
 %{__autoconf}
 %{__automake}
 %configure \
-       %{!?with_faces:--disable-compface} \
-       %{?with_gpg:--enable-gpgme} \
-       %{!?with_ipv6:--disable-ipv6} \
-       %{?with_jpilot:--enable-jpilot} \
-       %{?with_ldap:--enable-ldap} \
-       %{?with_ssl:--enable-ssl}
-
+       --%{?with_compface:en}%{!?with_compface:dis}able-compface \
+       --%{?with_gpg:en}%{!?with_gpg:dis}able-gpgme \
+       --%{?with_gtkspell:en}%{!?with_gtkspell}able-gtkspell \
+       --%{?with_ipv6:en}%{!?with_ipv6:dis}able-ipv6 \
+       --%{?with_jpilot:en}%{!?with_jpilot:dis}able-jpilot \
+       --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \
+       --%{?with_ssl:en}%{!?with_ssl:dis}able-ssl
 %{__make}
 
 %install
@@ -140,6 +141,77 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2006/02/13 15:59:28  freetz
+- merged to HEAD and updated to 2.2.0
+
+Revision 1.167.2.22  2006/02/09 14:01:47  freetz
+- 2.2.0rc
+
+Revision 1.167.2.21  2006/02/06 22:02:10  freetz
+- 2.2.0beta8
+
+Revision 1.167.2.20  2006/02/01 15:56:59  freetz
+- 2.2.0beta7, use compface instead of faces cruft
+
+Revision 1.167.2.19  2006/01/25 15:02:07  freetz
+- 2.2.0beta6
+
+Revision 1.167.2.18  2006/01/20 07:34:30  freetz
+- 2.2.0beta5
+
+Revision 1.167.2.17  2006/01/13 15:09:10  freetz
+- 2.2.0beta4
+
+Revision 1.167.2.16  2006/01/11 16:38:46  freetz
+- 2.2.0beta3
+
+Revision 1.167.2.15  2005/12/27 16:18:16  freetz
+- 2.2.0beta2
+
+Revision 1.167.2.14  2005/12/22 18:08:53  freetz
+- 2.2.0beta1
+
+Revision 1.167.2.13  2005/12/14 10:10:03  freetz
+- 2.1.9
+
+Revision 1.167.2.12  2005/11/30 12:28:36  freetz
+- 2.1.8
+
+Revision 1.167.2.11  2005/11/28 19:16:17  freetz
+- 2.1.8pre1 (major code modification for sending and receiving is in
+  progress)
+
+Revision 1.167.2.10  2005/11/18 14:09:01  freetz
+- 2.1.7, gtkspell support, fixed configure options
+
+Revision 1.167.2.9  2005/11/08 12:06:37  freetz
+- 2.1.6
+
+Revision 1.167.2.8  2005/10/30 10:57:48  dzeus
+- up to 2.1.5
+- zh_TW.Big5 to zh_TW & patch2 included in source
+
+Revision 1.167.2.7  2005/10/23 13:17:25  freetz
+- gtk dnd fixed, rel.2
+
+Revision 1.167.2.6  2005/10/19 08:21:07  freetz
+- 2.1.4
+
+Revision 1.167.2.5  2005/09/29 09:50:28  freetz
+- 2.1.3
+
+Revision 1.167.2.4  2005/09/15 12:28:50  freetz
+- 2.1.2
+
+Revision 1.167.2.3  2005/08/23 15:07:26  paladine
+- updated to 2.1.1
+
+Revision 1.167.2.2  2005/08/23 14:35:15  paladine
+- updated to 2.1.1
+
+Revision 1.167.2.1  2005/08/14 18:31:50  freetz
+- starting developement on 2.1.x unstable series
+
 Revision 1.173  2006/01/17 15:47:50  baggins
 - release 2
 - BR openldap 2.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.173&r2=1.174&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to