rpms/balsa/devel .cvsignore, 1.2, 1.3 balsa.spec, 1.1, 1.2 sources, 1.2, 1.3
Pawel Salek (pawsa)
fedora-extras-commits at redhat.com
Fri May 27 19:44:36 UTC 2005
Author: pawsa
Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27163
Modified Files:
.cvsignore balsa.spec sources
Log Message:
Bump balsa version to 2.3.2.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 May 2005 20:46:41 -0000 1.2
+++ .cvsignore 27 May 2005 19:44:34 -0000 1.3
@@ -1,2 +1,2 @@
-balsa-2.2.4.tar.bz2
-gmime-2.1.7.tar.bz2
+balsa-2.3.2.tar.bz2
+gmime-2.1.14.tar.bz2
Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- balsa.spec 20 May 2005 20:46:41 -0000 1.1
+++ balsa.spec 27 May 2005 19:44:34 -0000 1.2
@@ -1,7 +1,7 @@
#redhat and mdk are exclusive
%define redhat 1
%define mdk 0
-%define gmimever 2.1.7
+%define gmimever 2.1.14
%if %redhat
%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
%endif
@@ -9,30 +9,33 @@
%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings
%endif
-Summary: Balsa Mail Client
-Name: balsa
-Version: 2.2.4
-Release: 2
-License: GPL
-Group: Applications/Internet
-Source0: %{name}-%{version}.tar.bz2
-Source1: gmime-%{gmimever}.tar.bz2
-URL: http://balsa.gnome.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Name: balsa
+Version: 2.3.2
+Release: 1
+Summary: Balsa Mail Client
+
+Group: Applications/Internet
+License: GPL
+URL: http://balsa.gnome.org/
+Source0: http://balsa.gnome.org/%{name}-%{version}.tar.bz2
+Source1: http://balsa.gnome.org/gmime-%{gmimever}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Requires: libesmtp >= 1.0.3
Requires: aspell
-Provides: balsa
-
-BuildRequires: libesmtp-devel >= 1.0.3
%if %redhat
Requires: gtk2 >= 2.0.0
Requires: libgnome >= 2.0.0
Requires: libgnomeui >= 2.0.0
Requires: gnome-vfs2 >= 2.0.0
+Requires: libgnomeprint22 >= 2.2.0
+Requires: libgnomeprintui22 >= 2.2.0
BuildRequires: gtk2-devel >= 2.0.0
BuildRequires: libgnome-devel >= 2.0.0
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
@@ -53,102 +56,69 @@
Balsa is an e-mail reader. This client is part of the GNOME
desktop environment. It supports local mailboxes, POP3 and
IMAP.
-
+
+
%prep
-%setup -D -a 1
+%setup -q -D -a 1
+
%build
-# Needed for snapshot releases.
-%ifarch alpha
- ARCHFLAG="--host=alpha-redhat-linux"
-%endif
dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-shared && make install; cd $dir
+export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH"
-if [ ! -f configure ]; then
- CFLAGS="$RPM_OPT_FLAGS" \
- PKG_CONFIG_PATH="$PKG_CONFIG_PATH:gmime-%{gmimever}" \
- ./autogen.sh $ARCHFLAG %{config_opts}
-else
- CFLAGS="$RPM_OPT_FLAGS" \
- PKG_CONFIG_PATH="$PKG_CONFIG_PATH:gmime-%{gmimever}" \
- ./configure $ARCHFLAG %{config_opts}
-fi
-
+%configure
+make %{?_smp_mflags}
-if [ "$SMP" != "" ]; then
- (make "MAKE=make -k -j $SMP"; exit 0)
- make
-else
- make
-fi
-
%install
-rm -rf "$RPM_BUILD_ROOT"
-
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR="$RPM_BUILD_ROOT"
rm "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab
-#desktop-file-install --vendor gnome --delete-original \
-# --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-# $RPM_BUILD_ROOT%{_datadir}/applications/*
%find_lang %{name}
-
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if which scrollkeeper-update>/dev/null 2>&1; then
- scrollkeeper-update
+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
+ gtk-update-icon-cache %{_datadir}/icons/hicolor
fi
%postun
which scrollkeeper-update>/dev/null 2>&1 && scrollkeeper-update
+# no need to update cache - it will be removed.
+
%files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
%doc README COPYING ChangeLog NEWS TODO AUTHORS HACKING docs/mh-mail-HOWTO
%doc docs/vconvert.awk docs/pine2vcard
%{_bindir}/balsa
%{_libdir}/bonobo/servers/GNOME_Balsa.server
%{_datadir}/applications/balsa.desktop
-%{_datadir}/pixmaps/gnome-balsa2.png
-%{_datadir}/gnome/help/balsa/*
-%{_datadir}/omf/balsa/*
+%{_datadir}/balsa/hicolor/16x16/apps/*
+%{_datadir}/balsa/hicolor/24x24/apps/*
+%{_datadir}/balsa/hicolor/22x22
%{_datadir}/balsa/pixmaps/*
+%{_datadir}/gnome/help/balsa/*
+/usr/share/icons/hicolor/*
%{_datadir}/idl/Balsa.idl
+%{_datadir}/omf/balsa/*
+%{_datadir}/pixmaps/gnome-balsa2.png
%{_datadir}/sounds/balsa/*
%{_mandir}/man1/balsa.1*
-%config %{_sysconfdir}/sound/events/*
+%config(noreplace) %{_sysconfdir}/sound/events/balsa.soundlist
%changelog
-* Fri Nov 26 2004 Florian La Roche <laroche at redhat.com>
-- change %%clean
-
-* Mon Aug 30 2004 John Dennis <jdennis at redhat.com> 2.2.4-1,FC3,1
-- bring up to latest upstream
+* Fri May 20 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.2-1
+- adapt to Fedora Extras template.
-* Mon Jul 26 2004 John Dennis <jdennis at redhat.com>
-- bump rev for build
-
-* Thu Jul 22 2004 John Dennis <jdennis at redhat.com>
-- bump rev for build
-
-* Sat Jul 17 2004 John Dennis <jdennis at redhat.com>
-- bump release for build
-
-* Wed Jul 14 2004 John Dennis <jdennis at redhat.com> 2.2.0-1,FC3,2
-- add a 64 bit patch
-
-* Wed Jul 14 2004 John Dennis <jdennis at redhat.com> 2.2.0-1,FC3,1
-- bring up to latest upstream
- had to change the following from the upstream src rpm:
- dependency on pspell to aspell
- build dependency on libesmtp to libesmtp-devel
- comment out packager rpm tag, RH build system won't accept it
* Sat Jul 26 2003 Misu Moldovan <dumol at go.ro>
- further split the Red Hat and Mandrake sections
@@ -161,51 +131,3 @@
- remove all defined paths to user-specified.
- update configures, locales, update esmtp as a requires/buildrequires
-* Fri Nov 03 2000 Pawel Salek <pawsa at theochem.kth.se>
-- use %{_mandir} for location of the manual.
-
-* Fri Oct 20 2000 Pawel Salek <pawsa at theochem.kth.se>
-- require gtk+>= 1.2.7, not gnome-libs.
-
-* Fri Oct 20 2000 Pawel Salek <pawsa at theochem.kth.se>
-- require gnome-libs >= 1.2.7, earlier versions are buggy. drop building GSS.
-
-* Mon Sep 18 2000 Pawel Salek <pawsa at theochem.kth.se>
-- include only translation files, not whole directories, to aviod
- misleading messages when removing the package.
-
-* Tue Aug 15 2000 Pawel Salek <pawsa at theochem.kth.se>
-- added --disable-more-warning option - libmutt configure fails without it.
-
-* Thu Jun 1 2000 Peter Williams <peter at newton.cx>
-- Don't try to install IDL stuff as we have deleted it :-)
-
-* Thu Dec 30 1999 Bruno Pires Marinho <bapm at camoes.rnl.ist.utl.pt>
-- Improved the spec file by adding a sysconfdir=/etc, removing the man
- instalation because balsa does it now and adding the files on the /etc
- to the distribution
-
-* Tue Oct 5 1999 Jan Nieuwenhuizen <janneke at gnu.org>
-- Fixed man install
-
-* Sun Sep 26 1999 Stuart Parmenter <pavlov at balsa.net>
-- Updated to version 0.5.0
-
-* Mon Dec 14 1998 Stuart Parmenter <pavlov at pavlov.net>
-- Updated to version 0.4.8.
-
-* Sun Sep 09 1998 Stuart Parmenter <pavlov at pavlov.net>
-- Updated to version 0.4.7.
-
-* Sun Aug 23 1998 Stuart Parmenter <pavlov at pavlov.net>
-- Updated to version 0.4.5.
-
-* Mon Aug 3 1998 Stuart Parmenter <pavlov at pavlov.net>
-- Updated to version 0.4.0.
-
-* Sun Jul 26 1998 Stuart Parmenter <pavlov at pavlov.net>
-- Updated RPM file to reflect recent changes with the
- removal of c-client.
-
-* Thu Apr 02 1998 Michael Fulbright <msf at redhat.com>
-- First try at an RPM
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 20 May 2005 20:46:41 -0000 1.2
+++ sources 27 May 2005 19:44:34 -0000 1.3
@@ -1,2 +1,2 @@
-c58770f6203dc23c4d630da3daf2b106 balsa-2.2.4.tar.bz2
-d2590c1f4d4734edd82d7b8e620aea49 gmime-2.1.7.tar.bz2
+ab4d6febaca56d72d13acef819da193b balsa-2.3.2.tar.bz2
+ee1c2d0c1f76ae113f0dd70893bbacf4 gmime-2.1.14.tar.bz2
More information about the fedora-extras-commits
mailing list