SPECS: sylpheed.spec - merged from DEVEL

[freetz]

Author: freetz                       Date: Thu Jun 16 17:31:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   sylpheed.spec (1.159 -> 1.160) 

---- Diffs:

================================================================
Index: SPECS/sylpheed.spec
diff -u SPECS/sylpheed.spec:1.159 SPECS/sylpheed.spec:1.160
--- SPECS/sylpheed.spec:1.159	Thu Mar 24 21:23:48 2005
+++ SPECS/sylpheed.spec	Thu Jun 16 19:31:52 2005
@@ -12,29 +12,27 @@
 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:	1.0.4
-Release:	1
+Version:	2.0.0
+%define		_rel	beta2
+Release:	0.%{_rel}.1
 License:	GPL v2+
 Group:		X11/Applications/Networking
-Source0:	http://sylpheed.good-day.net/sylpheed/v1.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	e47b275c281335d09201503af2115eaa
+Source0:	http://sylpheed.good-day.net/sylpheed/v2.0beta/%{name}-%{version}%{_rel}.tar.bz2
+# Source0-md5:	47b1b65a80baaa6a2ea7b22533fe75a7
 Patch0:		%{name}-desktop.patch
-Patch1:		http://www.thewildbeast.co.uk/sylpheed/0.8.0/%{name}_save_all.patch
-Patch2:		%{name}-nolibs.patch
+Patch1:		%{name}-nolibs.patch
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_faces:BuildRequires:	faces-devel}
 BuildRequires:	gettext-devel
-BuildRequires:	gdk-pixbuf-devel >= 0.8
 %{?with_gpg:BuildRequires:	gpgme-devel >= 1:0.4.5}
-BuildRequires:	gtk+-devel >= 1.2.6
-BuildRequires:	imlib-devel
+BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	libtool
 %{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7d}
 %{?with_ldap:BuildRequires:	openldap-devel}
 %{?with_jpilot:BuildRequires:	pilot-link-devel}
-%{?with_faces:Requires:	faces}
 %{?with_jpilot:Requires:	pilot-link}
+BuildRequires:	pkgconfig
 Requires:	mailcap
 URL:		http://sylpheed.good-day.net/
 Obsoletes:	sylpheed-claws
@@ -80,10 +78,9 @@
 - catálogo de enderecos XML-based
 
 %prep
-%setup -q
+%setup -qn %{name}-%{version}%{_rel}
 %patch0 -p1
-%patch1 -p0
-%patch2 -p1
+%patch1 -p1
 
 mv -f po/{sr,sr at Latn}.po
 mv -f po/{zh_TW.Big5,zh_TW}.po
@@ -92,14 +89,11 @@
 
 %build
 %{__libtoolize}
-%{__gettextize}
 %{__aclocal} -I ac
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-gdk-pixbuf \
-	--enable-threads \
 	%{!?with_faces:--disable-compface} \
 	%{?with_gpg:--enable-gpgme} \
 	%{!?with_ipv6:--disable-ipv6} \
@@ -147,6 +141,55 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.160  2005/06/16 17:31:52  freetz
+- merged from DEVEL
+
+Revision 1.120.2.17  2005/06/16 09:55:33  freetz
+- 2.0.0beta2 - will be moved to HEAD shortly
+
+Revision 1.120.2.16  2005/06/09 13:22:26  freetz
+- 2.0.0beta1
+
+Revision 1.120.2.15  2005/06/01 11:05:29  dzeus
+- up to 1.9.12, BR: pkgconfig
+
+Revision 1.120.2.14  2005/05/29 17:22:12  paladine
+- missing BR: gettext-devel
+
+Revision 1.120.2.13  2005/05/17 13:53:38  freetz
+- 0.9.11
+
+Revision 1.120.2.12  2005/05/13 14:22:25  freetz
+- release down to 0.1, opening same folder as with 1.9.9 is two times
+  slower (propably due new GtkTreeView implementation)
+
+Revision 1.120.2.11  2005/05/13 14:10:23  freetz
+- 1.9.10, rel.1
+
+Revision 1.120.2.10  2005/04/20 20:29:06  dzeus
+- up to 1.9.9
+
+Revision 1.120.2.9  2005/04/10 16:38:04  dzeus
+- removed obsolete save_all.patch
+
+Revision 1.120.2.8  2005/03/30 09:19:43  freetz
+- restored changelog
+
+Revision 1.120.2.7  2005/03/30 09:12:13  freetz
+- removed obsoleted configure options, faces isn't required
+
+Revision 1.120.2.6  2005/03/30 08:58:04  freetz
+ - 1.9.7, cleaned up, corrected BRs, it should even build now...
+
+Revision 1.120.2.5  2005/03/16 08:48:56  dzeus
+- up to 1.9.6
+
+Revision 1.120.2.4  2005/03/11 06:10:48  dzeus
+- up to 1.9.5
+
+Revision 1.120.2.3  2005/03/06 11:51:49  dzeus
+- up to 1.9.4 NFY
+
 Revision 1.159  2005/03/24 20:23:48  paszczus
 - updated to 1.0.4
 
================================================================

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