From 257756a28614424e9308930c4ad3bc5ef2851a57 Mon Sep 17 00:00:00 2001 From: Pawel Salek Date: Jun 06 2005 22:30:17 +0000 Subject: - bump version to 2.3.3 - add libesmtp-devel dependency. - do not forget about config_opts. --- diff --git a/.cvsignore b/.cvsignore index 8682def..c5755ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -balsa-2.3.2.tar.bz2 gmime-2.1.14.tar.bz2 +balsa-2.3.3.tar.bz2 diff --git a/balsa.spec b/balsa.spec index 3135e48..17b6811 100644 --- a/balsa.spec +++ b/balsa.spec @@ -1,17 +1,20 @@ -#redhat and mdk are exclusive -%define redhat 1 +#fedora and mdk are exclusive +%define fedora 1 %define mdk 0 %define gmimever 2.1.14 -%if %redhat +%define rel 1 +%if %fedora %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings --with-ssl --with-gss +%define rel 1.FC3 %endif %if %mdk %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings +%define rel mdk %endif Name: balsa -Version: 2.3.2 -Release: 1 +Version: 2.3.3 +Release: %{rel} Summary: Balsa Mail Client Group: Applications/Internet @@ -23,7 +26,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libesmtp >= 1.0.3 Requires: aspell -%if %redhat +Requires: openssl +BuildRequires: libesmtp-devel >= 1.0.3 +BuildRequires: aspell-devel +BuildRequires: openssl-devel + +%if %fedora Requires: gtk2 >= 2.0.0 Requires: libgnome >= 2.0.0 Requires: libgnomeui >= 2.0.0 @@ -36,7 +44,6 @@ BuildRequires: libgnomeui-devel >= 2.0.0 BuildRequires: gnome-vfs2-devel >= 2.0.0 BuildRequires: libgnomeprint22-devel >= 2.2.0 BuildRequires: libgnomeprintui22-devel >= 2.2.0 -BuildRequires: aspell-devel %endif %if %mdk Requires: gtk+2.0 @@ -57,17 +64,16 @@ Balsa is an e-mail reader. This client is part of the GNOME desktop environment. It supports local mailboxes, POP3 and IMAP. - %prep %setup -q -D -a 1 - %build dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-shared && make install; cd $dir export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH" -%configure +%configure %{config_opts} + make %{?_smp_mflags} @@ -83,6 +89,7 @@ rm -rf $RPM_BUILD_ROOT %post which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update + if which gtk-update-icon-cache >/dev/null 2>&1; then # cf. images/Makefile - this is probably incomplete. gtk-update-icon-cache %{_datadir}/balsa/hicolor @@ -91,8 +98,8 @@ fi %postun which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update -# no need to update cache - it will be removed. +# no need to update cache - it will be removed. %files -f %{name}.lang %defattr(-,root,root,-) @@ -116,6 +123,11 @@ which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update %changelog +* Tue Jun 7 2005 Pawel Salek - 2.3.3-1 +- bump version to 2.3.3 +- add libesmtp-devel dependency. +- do not forget about config_opts. + * Fri May 20 2005 Pawel Salek - 2.3.2-1 - adapt to Fedora Extras template. diff --git a/sources b/sources index b8b821f..9038e61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ab4d6febaca56d72d13acef819da193b balsa-2.3.2.tar.bz2 ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2 +ac43ab8ca5ccc6782daac21e370b8605 balsa-2.3.3.tar.bz2