Author: dzeus Date: Sun Mar 6 11:51:55 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- up to 1.9.4 NFY
---- Files affected:
SPECS:
sylpheed.spec (1.120.2.2 -> 1.120.2.3)
---- Diffs:
================================================================
Index: SPECS/sylpheed.spec
diff -u SPECS/sylpheed.spec:1.120.2.2 SPECS/sylpheed.spec:1.120.2.3
--- SPECS/sylpheed.spec:1.120.2.2 Tue Mar 2 18:34:13 2004
+++ SPECS/sylpheed.spec Sun Mar 6 12:51:49 2005
@@ -1,51 +1,45 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without jconv # without jconv support
-%bcond_without gpg # without gpg support
-%bcond_without gtkspell # without gtkspell support
-%bcond_without ssl # without ssl support
-%bcond_without ipv6 # without ipv6 support
-%bcond_without ldap # without ldap support
-%bcond_without faces # without compfaces support
+%bcond_without gpg # without GnuPG support
+%bcond_without ssl # without SSL support
+%bcond_without ipv6 # without IPv6 support
+%bcond_without ldap # without LDAP support
+%bcond_without faces # without compfaces support
+%bcond_without jpilot # without JPilot support
#
-%define rname sylpheed
-%define snap 20040302
-#
-Summary: GTK+2 based fast e-mail client
-Summary(pl): Szybki klient poczty bazujący na GTK+2
-Summary(pt_BR): Um rápido e leve cliente de email baseado em GTK+2
-Name: sylpheed-gtk2
-Version: 0.9.9
-Release: 0.%{snap}.1
+Summary: GTK+ based fast e-mail client
+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.9.4
+Release: 0.1
License: GPL v2+
Group: X11/Applications/Networking
-Source0: %{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: 76ad9dcf892247f68e67ddc71dc0220c
-Patch0: %{rname}-desktop.patch
-Patch1:
http://www.thewildbeast.co.uk/sylpheed/0.8.0/%{rname}_save_all.patch
-Patch2: %{name}-gtkspell.patch
-Patch3: %{name}-scrollbarpolicy.patch
-BuildRequires: autoconf
+Source0:
http://sylpheed.good-day.net/sylpheed/v1.9/%{name}-%{version}.tar.bz2
+# Source0-md5: 49f35c104a6c4e56ad76816d8140a4b4
+Patch0: %{name}-desktop.patch
+Patch1:
http://www.thewildbeast.co.uk/sylpheed/0.8.0/%{name}_save_all.patch
+Patch2: %{name}-nolibs.patch
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
+%{?with_faces:BuildRequires: faces-devel}
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel
-BuildRequires: intltool
+BuildRequires: gdk-pixbuf-devel >= 0.8
+%{?with_gpg:BuildRequires: gpgme-devel >= 1:0.4.5}
+BuildRequires: gtk+-devel >= 2.4.0
+BuildRequires: imlib-devel
BuildRequires: libtool
-# experimental sorting of bconds
-%{?with_faces:BuildRequires: faces-devel}
-%{?with_gpg:BuildRequires: gpgme-devel >= 0.3.10}
-%{?with_gtkspell:BuildRequires: gtkspell-devel >= 2.0.5}
-%{?with_jconv:BuildRequires: libjconv-devel}
+%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
%{?with_ldap:BuildRequires: openldap-devel}
-%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7c}
+%{?with_jpilot:BuildRequires: pilot-link-devel}
%{?with_faces:Requires: faces}
+%{?with_jpilot:Requires: pilot-link}
Requires: mailcap
-URL: http://sylpheed-gtk2.sourceforge.net/
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Conflicts: gpgme-devel >= 4.0
-Obsoletes: sylpheed
+URL: http://sylpheed.good-day.net/
Obsoletes: sylpheed-claws
+Obsoletes: sylpheed-gtk2
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
This program is an X based fast e-mail client which has features (or
@@ -61,14 +55,15 @@
- SSL support
%description -l pl
-Szybki klient poczty o możliwościach takich jak
-- o przyjazny, intuicyjny interfejs użytkownika
+Szybki klient poczty o możliwościach takich jak:
+- przyjazny, intuicyjny interfejs użytkownika
- zintegrowany klient USENET
- możliwość pracy wyłącznie przy użyciu klawiatury
- klawiszologia typu Mew/Wanderlust
- obsługa wieloczęściowych MIME
- obsługa dowolnej ilości kont pocztowych
-- funkcje sortowania o książka adresowa
+- funkcje sortowania
+- książka adresowa
- wsparcie szyfrowania SSL
%description -l pt_BR
@@ -85,36 +80,35 @@
- catálogo de enderecos XML-based
%prep
-%setup -qn %{name}-%{version}-%{snap}
+%setup -q
%patch0 -p1
#%patch1 -p0
%patch2 -p1
-%patch3 -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
%build
-cp /usr/share/automake/mkinstalldirs .
-glib-gettextize --copy --force
%{__libtoolize}
-intltoolize --copy --force
+%{__gettextize}
%{__aclocal} -I ac
%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
- --%{?with_jconv:en}%{!?with_jconv:dis}able-jconv \
--enable-gdk-pixbuf \
--enable-threads \
- %{?with_faces:--disable-compfaces} \
+ %{!?with_faces:--disable-compface} \
%{?with_gpg:--enable-gpgme} \
- %{?with_gtkspell:--enable-gtkspell} \
- %{?with_ipv6:--enable-ipv6} \
+ %{!?with_ipv6:--disable-ipv6} \
+ %{?with_jpilot:--enable-jpilot} \
%{?with_ldap:--enable-ldap} \
%{?with_ssl:--enable-ssl}
%{__make}
-cd po; /bin/sh poconv.sh
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
@@ -122,28 +116,28 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{rname}.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install %{rname}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}
+install %{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
-%find_lang %{rname}
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f %{rname}.lang
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{rname}/faq/en
-%{_datadir}/%{rname}/manual/en
-%dir %{_datadir}/%{rname}
-%dir %{_datadir}/%{rname}/faq
-%dir %{_datadir}/%{rname}/manual
-%lang(de) %{_datadir}/%{rname}/faq/de
-%lang(es) %{_datadir}/%{rname}/faq/es
-%lang(fr) %{_datadir}/%{rname}/faq/fr
-%lang(it) %{_datadir}/%{rname}/faq/it
-%lang(ja) %{_datadir}/%{rname}/manual/ja
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/manual
+%{_datadir}/%{name}/manual/en
+%lang(ja) %{_datadir}/%{name}/manual/ja
+%dir %{_datadir}/%{name}/faq
+%{_datadir}/%{name}/faq/en
+%lang(de) %{_datadir}/%{name}/faq/de
+%lang(es) %{_datadir}/%{name}/faq/es
+%lang(fr) %{_datadir}/%{name}/faq/fr
+%lang(it) %{_datadir}/%{name}/faq/it
%{_desktopdir}/sylpheed.desktop
%{_pixmapsdir}/sylpheed.png
@@ -153,15 +147,133 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.120.2.2 2004/03/02 17:34:13 freetz
-- 0.9.9-20040302 with a bunch of bugfixes
-- gtkspell support added
-- patch for deprecated scrollbar policy added
- note: works nice and stable (like before ;)
-
-Revision 1.120.2.1 2003/12/11 19:33:41 freetz
-- separated from HEAD
-- updated for 0.9.7
+Revision 1.120.2.3 2005/03/06 11:51:49 dzeus
+- up to 1.9.4 NFY
+
+Revision 1.158 2005/03/04 18:15:14 dzeus
+- up to 1.0.3
+
+Revision 1.157 2005/03/01 13:40:53 dzeus
+- up to 1.0.2
+
+Revision 1.156 2005/02/12 10:02:43 dzeus
+- upss, gpgme >= 0.4.5
+
+Revision 1.155 2005/02/12 09:27:51 dzeus
+- up to 1.0.1, corrected Source0 URL, STBR
+
+Revision 1.154 2005/01/09 11:50:39 havner
+- rel up
+
+Revision 1.153 2005/01/09 11:47:53 havner
+- epochs
+
+Revision 1.152 2005/01/09 11:43:44 havner
+- rel 2
+
+Revision 1.151 2004/12/24 09:55:14 adamg
+- updated to 1.0.0
+
+Revision 1.150 2004/12/17 12:19:35 dzeus
+- BR: imlib-devel
+
+Revision 1.149 2004/12/17 10:04:58 adamg
+- updated to 1.0.0rc
+
+Revision 1.148 2004/12/04 09:55:03 dzeus
+- up to 1.0.0beta4
+- removed unused patch
+
+Revision 1.147 2004/11/23 10:52:05 paladine
+- rel .2 for fixed desktop patch
+
+Revision 1.146 2004/11/19 23:22:26 dzeus
+- more cosmetics :)
+
+Revision 1.145 2004/11/19 23:11:35 dzeus
+- enable jpilot support
+- fixed compface bcond
+- cosmetics
+
+Revision 1.144 2004/11/17 20:39:15 dzeus
+- up to 1.0.0beta3
+
+Revision 1.143 2004/11/01 12:26:34 deejay1
+- more proper beta suffix handling
+
+Revision 1.142 2004/10/30 09:26:41 dzeus
+- up to 1.0.0beta1
+
+Revision 1.141 2004/10/07 21:49:56 dzeus
+- cosmetics, removed ac_fixes.patch
+- gpg/gdk-pixbuf is working now, rel. 2 STBR
+
+Revision 1.140 2004/10/07 13:28:50 krolik
+- up to 0.9.99, rel 1
+
+Revision 1.139 2004/08/28 13:11:48 dzeus
+- rel. 2 STBR
+
+Revision 1.138 2004/08/28 08:21:10 dzeus
+- added common-smtp-server.patch
+
+Revision 1.137 2004/06/17 12:25:15 paszczus
+- updated to 0.9.12
+
+Revision 1.136 2004/06/07 18:50:44 blues
+- release 2
+
+Revision 1.135 2004/05/30 18:03:39 freetz
+- added Obsoletes for gtk2 version
+- incidentally upgraded to 0.9.11
+
+Revision 1.134 2004/04/05 15:08:17 deejay1
+- rel 5 to rebuild with openLDAP (aka STBR release)
+
+Revision 1.133 2004/03/26 13:36:22 blues
+- release 4 ( rel 3 is in RA)
+
+Revision 1.132 2004/03/19 23:46:38 ankry
+- massive change: BR openssl-devel >= 0.9.7d
+
+Revision 1.131 2004/03/17 21:12:28 deejay1
+- rel. 2 to rebuild with new openLDAP
+
+Revision 1.130 2004/03/08 02:07:19 adgor
+- Removed bogus conflict
+
+Revision 1.129 2004/03/02 09:34:26 deejay1
+- updated to 0.9.10; gpg/gdk-pixbuf still not working
+
+Revision 1.128 2004/02/08 07:15:56 misi3k
+- updated to 0.9.9
+
+Revision 1.127 2004/02/01 10:47:13 qboosh
+- removed acinclude breakage from ac_fixes patch, add -I to aclocal instead
+- added nolibs patch
+- removed libjconv stuff, obsolete since long time (iconv is used now)
+- standardize locale dir names (sr->[EMAIL PROTECTED], zh_TW.Big5->zh_TW)
+- release 1
+
+Revision 1.126 2003/12/18 15:41:12 deejay1
+- rel down - the sylpheed-ac_fixes.patch breaks too many things instead
+ of fixing them
+- typo
+
+Revision 1.125 2003/12/18 09:10:55 qboosh
+- it should be _Build_Conflicts
+
+Revision 1.124 2003/12/18 09:05:47 deejay1
+- new bcond:when built without gpg there's no need for Conflicts with gpgme
+
+Revision 1.123 2003/12/17 06:49:46 erjot
+- in 0.9.8 ipv6 is enabled by default
+
+Revision 1.122 2003/12/16 21:00:48 adamg
+- updated to 0.9.8a
+
+Revision 1.121 2003/12/12 20:56:27 adamg
+- updated to 0.9.8
Revision 1.120 2003/12/11 17:55:53 freetz
- removed gtk+2 stuff (moving it to seperate branch)
@@ -216,7 +328,7 @@
Revision 1.104 2003/07/06 12:19:08 misi3k
- rel 0.1
- updated to 0.9.3
-Note: gtk+2 not tested
+ Note: gtk+2 not tested
Revision 1.103 2003/07/04 14:51:31 freetz
- fixed *.po convertion
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/sylpheed.spec?r1=1.120.2.2&r2=1.120.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
