rpms/balsa/FC-4 .cvsignore, 1.3, 1.4 balsa.spec, 1.2, 1.3 sources, 1.3, 1.4

[Pawel Salek (pawsa)]

Author: pawsa

Update of /cvs/extras/rpms/balsa/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29410

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
balsa.spec: sync the spec file with devel - update to 2.3.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	27 May 2005 19:44:34 -0000	1.3
+++ .cvsignore	13 Jun 2005 08:12:03 -0000	1.4
@@ -1,2 +1,2 @@
-balsa-2.3.2.tar.bz2
+balsa-2.3.3.tar.bz2
 gmime-2.1.14.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/balsa.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- balsa.spec	27 May 2005 19:44:34 -0000	1.2
+++ balsa.spec	13 Jun 2005 08:12:03 -0000	1.3
@@ -1,17 +1,9 @@
-#redhat and mdk are exclusive
-%define redhat 1
-%define mdk    0
 %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
-%if %mdk
-%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --enable-threads --disable-more-warnings
-%endif
 
 Name:           balsa
-Version:        2.3.2
-Release:        1
+Version:        2.3.3
+Release:        1%{?dist}
 Summary:        Balsa Mail Client
 
 Group:          Applications/Internet
@@ -22,77 +14,59 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libesmtp >= 1.0.3
-Requires: aspell
-%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: libesmtp-devel >= 1.0.3
+BuildRequires: aspell-devel
+BuildRequires: openssl-devel
+
 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
-Requires: gtk+2.0
-Requires: libgnome2_0 
-Requires: libgnomeui2_0
-Requires: libgnome-vfs2_0
-BuildRequires:  libgtk+2.0_0-devel
-BuildRequires:  libgnome2_0-devel 
-BuildRequires:  libgnomeui2_0-devel
-BuildRequires:  libgnome-vfs2_0-devel
-BuildRequires:  libpspell4-devel
-BuildRequires:  libltdl3-devel
-BuildRequires:  libpcre0-devel
-%endif
+BuildRequires:  desktop-file-utils
 
 %description
 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}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT"
-rm "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab
+rm -f "$RPM_BUILD_ROOT%{_bindir}"/balsa-ab
 
+desktop-file-install $RPM_BUILD_ROOT%{_datadir}/applications/balsa.desktop \
+        --vendor=fedora \
+        --add-category=X-Fedora \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        --copy-name-to-generic-name \
+        --delete-original
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+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
-    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.
 
+# no need to update cache - it will be removed.
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -100,13 +74,11 @@
 %doc docs/vconvert.awk docs/pine2vcard
 %{_bindir}/balsa
 %{_libdir}/bonobo/servers/GNOME_Balsa.server
-%{_datadir}/applications/balsa.desktop
-%{_datadir}/balsa/hicolor/16x16/apps/*
-%{_datadir}/balsa/hicolor/24x24/apps/*
-%{_datadir}/balsa/hicolor/22x22
+%{_datadir}/applications/*.desktop
+%{_datadir}/balsa/hicolor/*
 %{_datadir}/balsa/pixmaps/*
 %{_datadir}/gnome/help/balsa/*
-/usr/share/icons/hicolor/*
+%{_datadir}/icons/hicolor/*
 %{_datadir}/idl/Balsa.idl
 %{_datadir}/omf/balsa/*
 %{_datadir}/pixmaps/gnome-balsa2.png
@@ -116,6 +88,17 @@
 
 
 %changelog
+* Mon Jun 13 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
+- libesmtp imported to fedora extras - reenable.
+
+* Sat Jun 11 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.3
+- Implement the reviewers's suggestions as on fedora-extras-list
+
+* Tue Jun  7 2005 Pawel Salek <pawsa at theochem.kth.se> - 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 <pawsa at theochem.kth.se> - 2.3.2-1
 - adapt to Fedora Extras template.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	27 May 2005 19:44:34 -0000	1.3
+++ sources	13 Jun 2005 08:12:03 -0000	1.4
@@ -1,2 +1,2 @@
-ab4d6febaca56d72d13acef819da193b  balsa-2.3.2.tar.bz2
+ac43ab8ca5ccc6782daac21e370b8605  balsa-2.3.3.tar.bz2
 ee1c2d0c1f76ae113f0dd70893bbacf4  gmime-2.1.14.tar.bz2