rpms/claws-mail/EL-5 claws-mail.desktop, 1.1, 1.2 claws-mail.spec, 1.10, 1.11

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/claws-mail/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28929

Modified Files:
	claws-mail.desktop claws-mail.spec 
Log Message:
- merge with F-7 version



Index: claws-mail.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/EL-5/claws-mail.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- claws-mail.desktop	8 Dec 2006 07:11:14 -0000	1.1
+++ claws-mail.desktop	4 Jan 2008 08:05:06 -0000	1.2
@@ -2,7 +2,7 @@
 Name=Claws Mail
 Comment=E-Mail client
 Exec=claws-mail
-Icon=claws-mail.png
+Icon=claws-mail
 Terminal=false
 Type=Application
 Encoding=UTF-8


Index: claws-mail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/claws-mail/EL-5/claws-mail.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- claws-mail.spec	17 Dec 2007 21:28:05 -0000	1.10
+++ claws-mail.spec	4 Jan 2008 08:05:06 -0000	1.11
@@ -1,18 +1,17 @@
 Name:           claws-mail
-Version:        3.1.0
+Version:        3.2.0
 Release:        1%{?dist}
 Summary:        The extended version of Sylpheed
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
-Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/claws-mail-3.2.0.tar.bz2
 Source1:        claws-mail.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
 BuildRequires:  gtk2-devel >= 2.6.2
-#BuildRequires:  compface >= 1.4
-#BuildRequires:  compface-devel
+BuildRequires:  compface >= 1.4
 BuildRequires:  openssl-devel >= 0.9.7
 BuildRequires:  openldap-devel >= 2.0.7
 BuildRequires:  aspell-devel >= 0.50.1
@@ -26,6 +25,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.51
 BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  compface-devel
 BuildRequires:  perl
 BuildRequires:  libtool
 BuildRequires:  libSM-devel
@@ -111,9 +111,8 @@
            --enable-spamassassin-plugin \
            --enable-aspell \
            --disable-dependency-tracking \
-           --disable-rpath 
-# disable for now on EL
-#           --enable-compface
+           --disable-rpath \
+           --enable-compface
 
 %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
@@ -162,6 +161,9 @@
 # don't think we need icon-theme.cache
 %{__rm} -f ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/icon-theme.cache
 
+# set same date on config.h across builds for multilib (#340871)
+touch -r NEWS ${RPM_BUILD_ROOT}%{_includedir}/%{name}/config.h
+
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
@@ -208,6 +210,21 @@
 %{_libdir}/claws-mail/plugins/bogofilter.so
 
 %changelog
+* Mon Dec 17 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.2.0-1
+- version upgrade
+
+* Sun Dec 09 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.1.0-4
+- fix #340871 multilib
+
+* Sat Dec 08 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.1.0-3
+- fix desktop file
+
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.1.0-2
+- Rebuild for deps
+
 * Mon Nov 19 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.1.0-1
 - version upgrade